[FFmpeg-devel] [PATCH]Ticket 320

[Carl Eugen Hoyos]

Hi!

Ticket 320 contains a transport stream encoded with Makito encoder that has 
AAC audio with stream type 0x11 (LATM/LOAS).
Attached patch removes the hard-coding of LATM/LOAS for 0x11, and allows auto-
detection of AAC (in case of ticket 320) or LATM/LOAS (for non-broken files).

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 68e3a76..f824315 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -525,7 +525,9 @@ 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 }, /* LATM syntax */
+    /* Makito encoder sets stream type 0x11 for AAC,
+     * so auto-detect LOAS/LATM instead of hardcoding it. */
+//  { 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 },