From 8ee704c39297033b58c3fa59a38288006346f4cd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 19 Jan 2014 18:35:33 +0100 Subject: [PATCH] avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0 Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer (cherry picked from commit 5800b08572ef5f776950fc6f1b6572ba9a6b1933) Conflicts: libavformat/matroskadec.c --- libavformat/matroskadec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ebad0d51b9..1d0f1b2eb5 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1634,8 +1634,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_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX-12) { /* Only ALAC's magic cookie is stored in Matroska's track headers. Create the "atom size", "tag", and "tag version" fields the