Commit 0b1bdd45 authored by bcoudurier's avatar bcoudurier

Disable LATM AAC in mpegts, this is not supported and produce too many

bug reports. Also warn the user about it.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22947 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 24dac4bd
...@@ -497,7 +497,7 @@ static const StreamType ISO_types[] = { ...@@ -497,7 +497,7 @@ static const StreamType ISO_types[] = {
{ 0x04, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 }, { 0x04, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 },
{ 0x0f, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, { 0x0f, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC },
{ 0x10, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4 }, { 0x10, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4 },
{ 0x11, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, /* LATM syntax */ //{ 0x11, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC }, /* LATM syntax */
{ 0x1b, AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 }, { 0x1b, AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 },
{ 0xd1, AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC }, { 0xd1, AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC },
{ 0xea, AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 }, { 0xea, AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 },
...@@ -594,6 +594,9 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, ...@@ -594,6 +594,9 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes,
sub_pes->sub_st = pes->sub_st = sub_st; sub_pes->sub_st = pes->sub_st = sub_st;
} }
} }
if (pes->stream_type == 0x11)
av_log(pes->stream, AV_LOG_WARNING,
"AAC LATM not currently supported, patch welcome\n");
if (st->codec->codec_id == CODEC_ID_NONE) if (st->codec->codec_id == CODEC_ID_NONE)
mpegts_find_stream_type(st, pes->stream_type, MISC_types); mpegts_find_stream_type(st, pes->stream_type, MISC_types);
......
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