diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-07-27 15:12:00 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-07-27 15:12:00 +0000 |
| commit | d3d265b28866f6ef6f9ea588a7049c60c7b74b5b (patch) | |
| tree | dbe11880374f7c3cbd8111c591576342d7c79b19 | |
| parent | f009e36f75bc137167a26356305d2c3eb83cac68 (diff) | |
| download | ffmpeg-d3d265b28866f6ef6f9ea588a7049c60c7b74b5b.tar.gz | |
matroska: add support for A_QUICKTIME/QDM2 codec
Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/matroska.c | 1 | ||||
| -rw-r--r-- | libavformat/matroska.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index b62511f29f..da42b56b33 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -59,6 +59,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_REAL/ATRC" , CODEC_ID_ATRAC3}, {"A_REAL/COOK" , CODEC_ID_COOK}, // {"A_REAL/SIPR" , CODEC_ID_SIPRO}, + {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2}, {"S_TEXT/UTF8" , CODEC_ID_TEXT}, {"S_TEXT/ASCII" , CODEC_ID_TEXT}, diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 26f4666fd9..35c618ba53 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -210,7 +210,7 @@ typedef enum { */ typedef struct CodecTags{ - char str[16]; + char str[20]; enum CodecID id; }CodecTags; |