mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-28 16:02:17 +02:00
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:
parent
b2cfd1fde7
commit
ade5851be0
@ -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 &&
|
||||||
|
Loading…
Reference in New Issue
Block a user