diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-24 00:47:36 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-24 01:21:13 +0100 |
| commit | f8b6d4818e1d77d7a4c071641243ef282fdb6255 (patch) | |
| tree | c1ccc0c97aaa2670bd67e3623c408f06e867ee5c /libavformat | |
| parent | 9d6e0ac6737f94553b826db6b1962383666295db (diff) | |
| download | ffmpeg-f8b6d4818e1d77d7a4c071641243ef282fdb6255.tar.gz | |
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.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 9251f7af32..8b92bc421e 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 }, |