aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-03-30 21:37:04 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-03-30 21:37:04 +0000
commitb89894abb7bc2309f2466edbeca6ffa8d263a975 (patch)
treeba921a76c322883c4e52a4efeb34465b69b3a4de /libavformat/matroska.c
parent1b4a516b94d9405130279fa046f0fc50cfbb17fa (diff)
downloadffmpeg-b89894abb7bc2309f2466edbeca6ffa8d263a975.tar.gz
matroska: add support for MLP and TRUEHD codec tags
Originally committed as revision 18254 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 482a155577..f101a000b4 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -27,6 +27,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"A_DTS" , CODEC_ID_DTS},
{"A_EAC3" , CODEC_ID_EAC3},
{"A_FLAC" , CODEC_ID_FLAC},
+ {"A_MLP" , CODEC_ID_MLP},
{"A_MPEG/L2" , CODEC_ID_MP2},
{"A_MPEG/L1" , CODEC_ID_MP2},
{"A_MPEG/L3" , CODEC_ID_MP3},
@@ -45,6 +46,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_TRUEHD" , CODEC_ID_TRUEHD},
{"A_TTA1" , CODEC_ID_TTA},
{"A_VORBIS" , CODEC_ID_VORBIS},
{"A_WAVPACK4" , CODEC_ID_WAVPACK},