diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:28:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:28:23 +0200 |
| commit | 61301ca7860fb044995c71a0cd432cb3d833eb3b (patch) | |
| tree | ebe79c242179339032ea8528a3a5bb0b65457fff /libavformat/flacenc.h | |
| parent | 03ffaed3f0199f82ae32c28923f41f22123aea95 (diff) | |
| parent | 54ed488b1af583df6c9d2a73b4a44f16b7e4f82c (diff) | |
| download | ffmpeg-61301ca7860fb044995c71a0cd432cb3d833eb3b.tar.gz | |
Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flacenc.h')
| -rw-r--r-- | libavformat/flacenc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/flacenc.h b/libavformat/flacenc.h index e83ee32aeb..2e9ee37766 100644 --- a/libavformat/flacenc.h +++ b/libavformat/flacenc.h @@ -29,4 +29,6 @@ int ff_flac_write_header(AVIOContext *pb, AVCodecContext *codec, int last_block); +int ff_flac_is_native_layout(uint64_t channel_layout); + #endif /* AVFORMAT_FLACENC_H */ |