diff options
| author | Janne Grunau <janne-ffmpeg@jannau.net> | 2010-11-02 08:32:33 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-ffmpeg@jannau.net> | 2010-11-02 08:32:33 +0000 |
| commit | 915bfa33d16f127f52b86b6cc68a50c38f3213a2 (patch) | |
| tree | 7a6e5d0076146eb77de1de59ff4ff871658cc016 /libavformat/mpegts.c | |
| parent | 136e19e1cf4fb1bc7b35e21357dd75c759b8b35e (diff) | |
mpegts: support LATM syntax
Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d2f9f1eaf0..64f76044a6 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -497,7 +497,7 @@ static const StreamType ISO_types[] = { { 0x04, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 }, { 0x0f, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, { 0x10, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4 }, - //{ 0x11, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, /* LATM syntax */ + { 0x11, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC_LATM }, /* LATM syntax */ { 0x1b, AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 }, { 0xd1, AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC }, { 0xea, AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 }, @@ -594,9 +594,6 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, sub_pes->sub_st = pes->sub_st = sub_st; } } - if (pes->stream_type == 0x11) - av_log(pes->stream, AV_LOG_WARNING, - "AAC LATM not currently supported, patch welcome\n"); if (st->codec->codec_id == CODEC_ID_NONE) mpegts_find_stream_type(st, pes->stream_type, MISC_types); |