[FFmpeg-cvslog] avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
Michael Niedermayer
git at videolan.org
Sun Jan 19 19:31:37 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 19 18:35:33 2014 +0100| [48218580e1ecc6687386e63d1f20c03482f69939] | committer: Michael Niedermayer
avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48218580e1ecc6687386e63d1f20c03482f69939
---
libavformat/matroskadec.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index bae9812..19e0e2e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1722,6 +1722,15 @@ static int matroska_read_header(AVFormatContext *s)
return ret;
codec_id = st->codec->codec_id;
extradata_offset = FFMIN(track->codec_priv.size, 18);
+ } else if (!strcmp(track->codec_id, "A_QUICKTIME")
+ && (track->codec_priv.size >= 86)
+ && (track->codec_priv.data != NULL)) {
+ fourcc = AV_RL32(track->codec_priv.data + 4);
+ codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
+ if (ff_codec_get_id(ff_codec_movaudio_tags, AV_RL32(track->codec_priv.data))) {
+ fourcc = AV_RL32(track->codec_priv.data);
+ codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
+ }
} else if (!strcmp(track->codec_id, "V_QUICKTIME")
&& (track->codec_priv.size >= 86)
&& (track->codec_priv.data != NULL)) {
More information about the ffmpeg-cvslog
mailing list