videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. 

Fixes decoding of broken mkv files containing ProRes video from ticket #3434.
This commit is contained in:
Carl Eugen Hoyos 2014-04-27 09:34:13 +02:00
parent b2cfd1fde7
commit ade5851be0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroskadec.c
View File

@ -1760,6 +1760,9 @@ static int matroska_read_header(AVFormatContext *s)
fourcc = AV_RL32(track->codec_priv.data + 16);
codec_id = ff_codec_get_id(ff_codec_bmp_tags,
fourcc);
if (!codec_id)
codec_id = ff_codec_get_id(ff_codec_movvideo_tags,
fourcc);
extradata_offset = 40;
} else if (!strcmp(track->codec_id, "A_MS/ACM") &&
track->codec_priv.size >= 14 &&