diff options
author | Tony Strauss <tony@animoto.com> | 2011-02-21 23:46:54 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 02:44:39 +0100 |
commit | 352cb0da903509b788121aa52354580806d31390 (patch) | |
tree | 7f7f94bd404275a52447ec2bd871ca21cc095141 | |
parent | 51e7c932daec1ffb6aacdc5e15f069b4dff6b313 (diff) | |
download | ffmpeg-352cb0da903509b788121aa52354580806d31390.tar.gz |
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@mansr.com>
(cherry picked from commit 6c065f0acd5b50a9037b561c6fc370b316832543)
-rw-r--r-- | libavformat/mpegtsenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 99becbcb31..be11a06ff0 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; |