summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHagen Schmidt <schmidthagen@googlemail.com>2015-12-15 08:00:48 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-29 21:40:33 +0100
commit583a6431460ac62bd91328a8856fb07a445124ea (patch)
treedbfb63ee34f8944c6f3ff216d00588eacdbf9500
parent1e2c2622120cd4dfb2a2cf32ee957807cee1e3f3 (diff)
downloadffmpeg-streaming-583a6431460ac62bd91328a8856fb07a445124ea.zip
ffmpeg-streaming-583a6431460ac62bd91328a8856fb07a445124ea.tar.gz
mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS
Fixes ticket 279. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mpegtsenc.c2
1 files changed, 0 insertions, 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;
OpenPOWER on IntegriCloud