dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-30 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'

Browse Source 
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-28 12:28:23 +02:00
parent 03ffaed3f0 54ed488b1a
commit 61301ca786
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/flacenc_header.c
View File

@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/channel_layout.h"
#include "libavcodec/flac.h"
#include "libavcodec/bytestream.h"
#include "avformat.h"
@@ -45,3 +47,17 @@ int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec,
return 0;
}
int ff_flac_is_native_layout(uint64_t channel_layout)
{
if (channel_layout == AV_CH_LAYOUT_MONO ||
channel_layout == AV_CH_LAYOUT_STEREO ||
channel_layout == AV_CH_LAYOUT_SURROUND ||
channel_layout == AV_CH_LAYOUT_QUAD ||
channel_layout == AV_CH_LAYOUT_5POINT0 ||
channel_layout == AV_CH_LAYOUT_5POINT1 ||
channel_layout == AV_CH_LAYOUT_6POINT1 ||
channel_layout == AV_CH_LAYOUT_7POINT1)
return 1;
return 0;
}