diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-04-22 20:34:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-04-22 20:34:30 +0000 |
| commit | 0403c2e3e4f45c3f6fb452e9af1d95a5df1e176c (patch) | |
| tree | 538062072fce91e08d0bf9d347a1cfc407381633 | |
| parent | 51e026d115efa7f36d14a25069286e5ac5a05d25 (diff) | |
Disable LATM AAC in mpegts, this is not supported and produce too many
bug reports. Also warn the user about it.
Originally committed as revision 22947 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mpegts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ac1e911e35..d594abcbf7 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 syntax */ { 0x1b, AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 }, { 0xd1, AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC }, { 0xea, AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 }, @@ -594,6 +594,9 @@ 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); |