[FFmpeg-cvslog] mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS

Hagen Schmidt git at videolan.org
Fri Jan 29 23:06:59 CET 2016


ffmpeg | branch: master | Hagen Schmidt <schmidthagen at googlemail.com> | Tue Dec 15 08:00:48 2015 +0100| [583a6431460ac62bd91328a8856fb07a445124ea] | committer: Michael Niedermayer

mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS

Fixes ticket 279.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/mpegtsenc.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index a20e229..7656720 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1523,8 +1523,6 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
             if (!ts_st->amux) {
                 av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format "
                                         "and extradata missing\n");
-                if (!st->nb_frames)
-                    return AVERROR_INVALIDDATA;
             } else {
             av_init_packet(&pkt2);
             pkt2.data = pkt->data;



More information about the ffmpeg-cvslog mailing list