From 1741fece7073f51efdd837a4f307ea2cdf3d1cfb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 26 Mar 2013 15:16:07 +0100 Subject: Only test the first frame for missing aac_adtstoasc bistream filter. Many players ignore broken aac frames, so don't abort mov or flv muxing when encountering one, just print a warning instead. Fixes ticket #2380. --- libavformat/flvenc.c | 3 +++ libavformat/movenc.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 502da0f0c5..e1dd43f716 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -493,10 +493,13 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { + if (!s->streams[pkt->stream_index]->nb_frames) { av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: " "use audio bitstream filter 'aac_adtstoasc' to fix it " "('-bsf:a aac_adtstoasc' option with ffmpeg)\n"); return AVERROR_INVALIDDATA; + } + av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); } if (flv->delay == AV_NOPTS_VALUE) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 42496b57e9..47dde94fd2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3185,8 +3185,11 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 && (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { + if (!s->streams[pkt->stream_index]->nb_frames) { av_log(s, AV_LOG_ERROR, "malformated aac bitstream, use -absf aac_adtstoasc\n"); return -1; + } + av_log(s, AV_LOG_WARNING, "aac bitstream error\n"); } else { avio_write(pb, pkt->data, size); } -- cgit v1.2.3