aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-11-07 23:44:56 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-11-07 23:44:56 +0000
commit28f008a9d3a852d94b84b8409668eec1329d3e78 (patch)
tree9472d40799dab2bbcb7fa0c8305f07e76ef2bec4
parent1a15ab492090de959dd2025b16a64411b39910b6 (diff)
downloadffmpeg-28f008a9d3a852d94b84b8409668eec1329d3e78.tar.gz
Support some LATM AAC streams (they can be decoded with MPlayer).
Originally committed as revision 20472 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegts.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index b11d0949e4..ceec2a15c2 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -501,6 +501,7 @@ static const StreamType ISO_types[] = {
{ 0x04, CODEC_TYPE_AUDIO, CODEC_ID_MP3 },
{ 0x0f, CODEC_TYPE_AUDIO, CODEC_ID_AAC },
{ 0x10, CODEC_TYPE_VIDEO, CODEC_ID_MPEG4 },
+ { 0x11, CODEC_TYPE_AUDIO, CODEC_ID_AAC }, /* LATM syntax */
{ 0x1b, CODEC_TYPE_VIDEO, CODEC_ID_H264 },
{ 0xd1, CODEC_TYPE_VIDEO, CODEC_ID_DIRAC },
{ 0xea, CODEC_TYPE_VIDEO, CODEC_ID_VC1 },