RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2015-09-03 17:31:14 +02:00
parent 8161220eee
commit 1e7ff5ac69
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/nutenc.c
View File

@ -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) {