generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-27 13:29:24 +02:00
commit 7e7b668ef5
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); fourcc = AV_RL32(track->codec_priv.data + 16);
codec_id = ff_codec_get_id(ff_codec_bmp_tags, codec_id = ff_codec_get_id(ff_codec_bmp_tags,
fourcc); fourcc);
if (!codec_id)
codec_id = ff_codec_get_id(ff_codec_movvideo_tags,
fourcc);
extradata_offset = 40; extradata_offset = 40;
} else if (!strcmp(track->codec_id, "A_MS/ACM") && } else if (!strcmp(track->codec_id, "A_MS/ACM") &&
track->codec_priv.size >= 14 && track->codec_priv.size >= 14 &&