From c41bf905f425c1f749dfeb23d11aa377a5104135 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 30 Aug 2011 10:35:29 +0200 Subject: [PATCH] Only autodetect loas in transport streams. The Makito encoder sets stream type 0x11 for AAC. This patch should be reverted if it breaks decoding valid streams (and the problem can't be fixed in the probe function). --- libavformat/mpegts.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 2238bdc04f..dc435c484b 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 },