diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 18:35:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 18:48:11 +0100 |
| commit | 5800b08572ef5f776950fc6f1b6572ba9a6b1933 (patch) | |
| tree | 0517c258f99105c65f8649f4839079cb46563f37 | |
| parent | 0500623d5840cd148c85c65a70a42b3b91ffd8e1 (diff) | |
| download | ffmpeg-5800b08572ef5f776950fc6f1b6572ba9a6b1933.tar.gz | |
avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 299cbd074e..bae98128fd 100644 --- 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; |