summaryrefslogtreecommitdiff
path: root/libavformat/matroska.c
diff options
context:
space:
mode:
authorMoritz Bunkus <moritz@bunkus.org>2012-08-05 16:25:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-05 17:59:12 +0200
commitbc3b4220296e24e2cdd1213208a470853fcb76c3 (patch)
tree8f9252f1fb0648d52f802ddaa1d756b99461c9d3 /libavformat/matroska.c
parentd106ffd942e2e1837d8b100161cb1df1aa7b617a (diff)
downloadffmpeg-bc3b4220296e24e2cdd1213208a470853fcb76c3.tar.gz
matroskadec: Implement support for ALAC
This patch implements support reading ALAC from Matroska files. The only non-trivial thing about it is that only the ALAC magic cookie is stored in Matroska's CodecPrivate element but not the "atom size", "tag" and "tag version" fields that FFMPEG's ALAC decoder expects. However, those are trivial to re-create. Sample files are available: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka and the CoreAudio file it was created from with today's mkvmerge: http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
-rw-r--r--libavformat/matroska.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 5e9a6cade3..ea91ed7494 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -24,6 +24,7 @@
const CodecTags ff_mkv_codec_tags[]={
{"A_AAC" , CODEC_ID_AAC},
{"A_AC3" , CODEC_ID_AC3},
+ {"A_ALAC" , CODEC_ID_ALAC},
{"A_DTS" , CODEC_ID_DTS},
{"A_EAC3" , CODEC_ID_EAC3},
{"A_FLAC" , CODEC_ID_FLAC},