[FFmpeg-cvslog] Only try to auto-detect LATM in mpegts if the LOAS demuxer was configured.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Jan 24 00:47:36 2013 +0100| [f8b6d4818e1d77d7a4c071641243ef282fdb6255] | committer: Carl Eugen Hoyos

Only try to auto-detect LATM in mpegts if the LOAS demuxer was configured.

This allows to decode LATM-in-mpegts without the LOAS demuxer.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8b6d4818e1d77d7a4c071641243ef282fdb6255
---

 libavformat/mpegts.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 9251f7a..8b92bc4 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -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 },