[FFmpeg-cvslog] r22947 - trunk/libavformat/mpegts.c

[Carl Eugen Hoyos]

Hi!

bcoudurier <subversion <at> mplayerhq.hu> writes:

> Modified: trunk/libavformat/mpegts.c
> ==============================================================================
> --- trunk/libavformat/mpegts.c	Thu Apr 22 20:58:39 2010	(r22946)
> +++ trunk/libavformat/mpegts.c	Thu Apr 22 22:34:30 2010	(r22947)
> @@ -497,7 +497,7 @@ static const StreamType ISO_types[] = {
>      { 0x04, AVMEDIA_TYPE_AUDIO,        CODEC_ID_MP3 },
>      { 0x0f, AVMEDIA_TYPE_AUDIO,        CODEC_ID_AAC },
>      { 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 */

Could you revert this hunk

> +    if (pes->stream_type == 0x11)
> +        av_log(pes->stream, AV_LOG_WARNING,
> +               "AAC LATM not currently supported, patch welcome\n");

and leave this one (so I will realize the duplicate the next time)?
Decoding works with mplayer -demuxer lavf -ac faad.

Carl Eugen