Commit 8f74807b authored by aurel's avatar aurel

matroskadec: add correct extradata offset for V_MS/VFW/FOURCC tracks

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19694 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b8d1d472
...@@ -1246,6 +1246,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -1246,6 +1246,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
&& track->codec_priv.data != NULL) { && track->codec_priv.data != NULL) {
track->video.fourcc = AV_RL32(track->codec_priv.data + 16); track->video.fourcc = AV_RL32(track->codec_priv.data + 16);
codec_id = ff_codec_get_id(ff_codec_bmp_tags, track->video.fourcc); codec_id = ff_codec_get_id(ff_codec_bmp_tags, track->video.fourcc);
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 >= 18 && track->codec_priv.size >= 18
&& track->codec_priv.data != NULL) { && track->codec_priv.data != NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment