mpegtsenc: use correct PES stream_id for AAC
authorTony Strauss <tony@animoto.com>
Mon, 21 Feb 2011 23:46:54 +0000 (23:46 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Feb 2011 01:44:39 +0000 (02:44 +0100)
This adds the AAC codec to the list of audio codecs that results
in a PES stream_id of 0xc0 (audio stream).

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6c065f0acd5b50a9037b561c6fc370b316832543)

libavformat/mpegtsenc.c

index 99becbc..be11a06 100644 (file)
@@ -746,7 +746,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
                     *q++ = 0xe0;
             } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
                        (st->codec->codec_id == CODEC_ID_MP2 ||
-                        st->codec->codec_id == CODEC_ID_MP3)) {
+                        st->codec->codec_id == CODEC_ID_MP3 ||
+                        st->codec->codec_id == CODEC_ID_AAC)) {
                 *q++ = 0xc0;
             } else {
                 *q++ = 0xbd;