# HG changeset patch # User bcoudurier # Date 1271968470 0 # Node ID c1cd2ffd5cdc4fc740a4a005bfea9829d6a8cfe2 # Parent b32c7be576691e45542668a56283ff3688dbcdaf Disable LATM AAC in mpegts, this is not supported and produce too many bug reports. Also warn the user about it. diff -r b32c7be57669 -r c1cd2ffd5cdc mpegts.c --- a/mpegts.c Thu Apr 22 12:54:50 2010 +0000 +++ b/mpegts.c Thu Apr 22 20:34:30 2010 +0000 @@ -497,7 +497,7 @@ { 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 @@ 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);