From 1e7ff5ac6923996f7292c82f102c68384fbc9d97 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Thu, 3 Sep 2015 17:31:14 +0200 Subject: [PATCH] nut: Use the correct codec_tag when multiple are available Some codecs use the codec_tag to signal specific information and picking the first one would lead to a broken file. Bug-Id: 883 CC: libav-stable@libav.org Signed-off-by: Luca Barbato --- libavformat/nutenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index b7b0c9c790..be6579dadb 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -438,7 +438,8 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, } ff_put_v(bc, 4); - if (!codec_tag || codec->codec_id == AV_CODEC_ID_RAWVIDEO) + if (av_codec_get_id(ff_nut_codec_tags, codec->codec_tag) == codec->codec_id || + !codec_tag || codec->codec_id == AV_CODEC_ID_RAWVIDEO) codec_tag = codec->codec_tag; if (codec_tag) {