summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-06 15:41:44 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-08 18:03:35 +0200
commite666e3ce9199946bde9b4a2691ccb73c99e45ab4 (patch)
tree53d7107559673ac2b56b719cb3a775774942d7ec /libmpdemux/demuxer.c
parent8d89878e7f1da22ce74926867e79aede07b28122 (diff)
downloadmpv-e666e3ce9199946bde9b4a2691ccb73c99e45ab4.tar.bz2
mpv-e666e3ce9199946bde9b4a2691ccb73c99e45ab4.tar.xz
demuxer.c: Add support for parsing LATM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32582 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 378100b180..b88949f192 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -444,6 +444,11 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse
init_avcodec();
switch (format) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
+ case MKTAG('M', 'P', '4', 'L'):
+ codec_id = CODEC_ID_AAC_LATM;
+ break;
+#endif
case 0x2000:
case 0x332D6361:
case 0x332D4341: