Commit f8b6d481 authored by Carl Eugen Hoyos's avatar 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.
parent 9d6e0ac6
...@@ -564,7 +564,9 @@ static const StreamType ISO_types[] = { ...@@ -564,7 +564,9 @@ static const StreamType ISO_types[] = {
{ 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 }, { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 },
/* Makito encoder sets stream type 0x11 for AAC, /* Makito encoder sets stream type 0x11 for AAC,
* so auto-detect LOAS/LATM instead of hardcoding it. */ * 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 }, { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 },
{ 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },
{ 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment