summaryrefslogtreecommitdiff
path: root/libavformat/flacenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-28 12:28:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 12:28:23 +0200
commit61301ca7860fb044995c71a0cd432cb3d833eb3b (patch)
treeebe79c242179339032ea8528a3a5bb0b65457fff /libavformat/flacenc.c
parent03ffaed3f0199f82ae32c28923f41f22123aea95 (diff)
parent54ed488b1af583df6c9d2a73b4a44f16b7e4f82c (diff)
downloadffmpeg-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.c')
-rw-r--r--libavformat/flacenc.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index d92801807e..f0b7d2956e 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "libavcodec/flac.h"
#include "avformat.h"
@@ -97,6 +98,23 @@ static int flac_write_header(struct AVFormatContext *s)
if (ret)
return ret;
+ /* add the channel layout tag */
+ if (codec->channel_layout &&
+ !(codec->channel_layout & ~0x3ffffULL) &&
+ !ff_flac_is_native_layout(codec->channel_layout)) {
+ AVDictionaryEntry *chmask = av_dict_get(s->metadata, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK",
+ NULL, 0);
+
+ if (chmask) {
+ av_log(s, AV_LOG_WARNING, "A WAVEFORMATEXTENSIBLE_CHANNEL_MASK is "
+ "already present, this muxer will not overwrite it.\n");
+ } else {
+ uint8_t buf[32];
+ snprintf(buf, sizeof(buf), "0x%"PRIx64, codec->channel_layout);
+ av_dict_set(&s->metadata, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0);
+ }
+ }
+
ret = flac_write_block_comment(s->pb, &s->metadata, !padding,
s->flags & AVFMT_FLAG_BITEXACT);
if (ret)