aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Bunkus <moritz@bunkus.org>2012-08-05 18:34:28 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-08-05 18:34:28 +0200
commitfe40dc1cecdf152ffacff6df1d9c5f0c7daced85 (patch)
treed8001af0a3a71be79500dae30c760e97188c8e9f
parent50b4dbf65a8b0fbd0155e1ffc0ed58fa591d3736 (diff)
downloadffmpeg-fe40dc1cecdf152ffacff6df1d9c5f0c7daced85.tar.gz
matroskaenc: Implement support for ALAC
-rw-r--r--libavformat/matroskaenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index f5fdaae2cd..30885a1cf6 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -475,6 +475,8 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
ret = ff_flac_write_header(dyn_cp, codec, 1);
else if (codec->codec_id == CODEC_ID_H264)
ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
+ else if (codec->codec_id == CODEC_ID_ALAC && (12 < codec->extradata_size))
+ ret = ff_isom_write_avcc(dyn_cp, codec->extradata + 12, codec->extradata_size - 12);
else if (codec->extradata_size)
avio_write(dyn_cp, codec->extradata, codec->extradata_size);
} else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {