diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-07-27 15:11:04 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-07-27 15:11:04 +0000 |
| commit | f009e36f75bc137167a26356305d2c3eb83cac68 (patch) | |
| tree | 97747c67e4c4f363cb965a64679c45e70521176b /libavformat/matroskadec.c | |
| parent | 18c7be650181a8532c5127e558b254ab55e351a2 (diff) | |
| download | ffmpeg-streaming-f009e36f75bc137167a26356305d2c3eb83cac68.zip ffmpeg-streaming-f009e36f75bc137167a26356305d2c3eb83cac68.tar.gz | |
matroska: add support for V_QUICKTIME track type
Originally committed as revision 14429 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index bea76f4..ba7580a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -31,6 +31,7 @@ #include "avformat.h" /* For codec_get_id(). */ #include "riff.h" +#include "isom.h" #include "matroska.h" #include "libavcodec/mpeg4audio.h" #include "libavutil/intfloat_readwrite.h" @@ -2550,6 +2551,15 @@ matroska_read_header (AVFormatContext *s, } + if (!strcmp(track->codec_id, "V_QUICKTIME") && + (track->codec_priv_size >= 86) && + (track->codec_priv != NULL)) { + MatroskaVideoTrack *vtrack = (MatroskaVideoTrack *) track; + + vtrack->fourcc = AV_RL32(track->codec_priv); + codec_id = codec_get_id(codec_movvideo_tags, vtrack->fourcc); + } + else if (codec_id == CODEC_ID_AAC && !track->codec_priv_size) { MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track; int profile = matroska_aac_profile(track->codec_id); |
