ffmpeg | branch: master | Luca Barbato <lu_z...@gentoo.org> | Thu Sep 3 17:31:14 2015 +0200| [1e7ff5ac6923996f7292c82f102c68384fbc9d97] | committer: Luca Barbato
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-sta...@libav.org Signed-off-by: Luca Barbato <lu_z...@gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e7ff5ac6923996f7292c82f102c68384fbc9d97 --- libavformat/nutenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index b7b0c9c..be6579d 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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
