avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0

Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 5800b08572
parent 0500623d58
commit 5800b08572
1 changed files with 5 additions and 1 deletions
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@ -1725,8 +1725,12 @@ static int matroska_read_header(AVFormatContext *s)
        } else if (!strcmp(track->codec_id, "V_QUICKTIME")
                   && (track->codec_priv.size >= 86)
                   && (track->codec_priv.data != NULL)) {
-            fourcc = AV_RL32(track->codec_priv.data);
+            fourcc = AV_RL32(track->codec_priv.data + 4);
            codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
+            if (ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(track->codec_priv.data))) {
+                fourcc = AV_RL32(track->codec_priv.data);
+                codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
+            }
        } else if (codec_id == AV_CODEC_ID_PCM_S16BE) {
            switch (track->audio.bitdepth) {
            case  8:  codec_id = AV_CODEC_ID_PCM_U8;     break;