[FFmpeg-cvslog] mpegtsenc: use correct PES stream_id for AAC

Tony Strauss git
Tue Feb 22 03:17:18 CET 2011


ffmpeg | branch: master | Tony Strauss <tony at animoto.com> | Mon Feb 21 23:46:54 2011 +0000| [352cb0da903509b788121aa52354580806d31390] | committer: Michael Niedermayer

mpegtsenc: use correct PES stream_id for AAC

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 at mansr.com>
(cherry picked from commit 6c065f0acd5b50a9037b561c6fc370b316832543)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=352cb0da903509b788121aa52354580806d31390
---

 libavformat/mpegtsenc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 99becbc..be11a06 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -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;




More information about the ffmpeg-cvslog mailing list