virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mpegts: support LATM syntax

Browse Source 
Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Janne Grunau 2010-11-02 08:32:33 +00:00
parent 136e19e1cf
commit 915bfa33d1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mpegts.c
View File

@ -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 }, /* 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,9 +594,6 @@ 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);