From: Luca Barbato Date: Thu, 3 Sep 2015 15:31:14 +0000 (+0200) Subject: nut: Use the correct codec_tag when multiple are available X-Git-Tag: android-x86-7.1-r1~252^2~1828 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e7ff5ac6923996f7292c82f102c68384fbc9d97;p=android-x86%2Fexternal-ffmpeg.git 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 --- 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) {