Commit 9d13432a authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/matroskadec: identify SMI as SVQ3

Fixes part of Ticket3256
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 48218580
...@@ -1732,7 +1732,7 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1732,7 +1732,7 @@ static int matroska_read_header(AVFormatContext *s)
codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc); codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
} }
} else if (!strcmp(track->codec_id, "V_QUICKTIME") } else if (!strcmp(track->codec_id, "V_QUICKTIME")
&& (track->codec_priv.size >= 86) && (track->codec_priv.size >= 21)
&& (track->codec_priv.data != NULL)) { && (track->codec_priv.data != NULL)) {
fourcc = AV_RL32(track->codec_priv.data + 4); fourcc = AV_RL32(track->codec_priv.data + 4);
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
...@@ -1740,6 +1740,8 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1740,6 +1740,8 @@ static int matroska_read_header(AVFormatContext *s)
fourcc = AV_RL32(track->codec_priv.data); fourcc = AV_RL32(track->codec_priv.data);
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
} }
if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI "))
codec_id = AV_CODEC_ID_SVQ3;
} else if (codec_id == AV_CODEC_ID_PCM_S16BE) { } else if (codec_id == AV_CODEC_ID_PCM_S16BE) {
switch (track->audio.bitdepth) { switch (track->audio.bitdepth) {
case 8: codec_id = AV_CODEC_ID_PCM_U8; break; case 8: codec_id = AV_CODEC_ID_PCM_U8; break;
......
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