Mercurial > libavformat.hg

changeset 5981:c1cd2ffd5cdc libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable LATM AAC in mpegts, this is not supported and produce too many bug reports. Also warn the user about it.
author bcoudurier
date Thu, 22 Apr 2010 20:34:30 +0000
parents b32c7be57669
children f74198942337
files mpegts.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);