diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-27 09:34:13 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-27 12:52:34 +0200 |
| commit | ade5851be085d392cc7490d4cf64c6fe4ac6ae6a (patch) | |
| tree | a173659cd50bc14e9b4adbac06755c554294daa8 /libavformat/matroskadec.c | |
| parent | b2cfd1fde7a2643be9978ec8da58c184a5d9a140 (diff) | |
| download | ffmpeg-ade5851be085d392cc7490d4cf64c6fe4ac6ae6a.tar.gz | |
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.
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 66268fd27b..7c10f33e6e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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 && |