Only try to auto-detect LATM in mpegts if the LOAS demuxer was configured.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 23 Jan 2013 23:47:36 +0000 (00:47 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 24 Jan 2013 00:21:13 +0000 (01:21 +0100)
This allows to decode LATM-in-mpegts without the LOAS demuxer.

libavformat/mpegts.c

index 9251f7a..8b92bc4 100644 (file)
@@ -564,7 +564,9 @@ static const StreamType ISO_types[] = {
     { 0x10, AVMEDIA_TYPE_VIDEO,      AV_CODEC_ID_MPEG4 },
     /* Makito encoder sets stream type 0x11 for AAC,
      * so auto-detect LOAS/LATM instead of hardcoding it. */
-//  { 0x11, AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
+#if !CONFIG_LOAS_DEMUXER
+    { 0x11, AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
+#endif
     { 0x1b, AVMEDIA_TYPE_VIDEO,       AV_CODEC_ID_H264 },
     { 0xd1, AVMEDIA_TYPE_VIDEO,      AV_CODEC_ID_DIRAC },
     { 0xea, AVMEDIA_TYPE_VIDEO,        AV_CODEC_ID_VC1 },