diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-26 15:16:07 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-27 00:52:39 +0100 |
| commit | fc7071cb53ded2e332947ce2145b587c5bdcd075 (patch) | |
| tree | 872e5a6b87e9e7c1792b2bcd7cbb5c2db02e9fcb | |
| parent | 9b0d0fd3c47ea8a60dfe8403db15f80b4c13acea (diff) | |
| download | ffmpeg-fc7071cb53ded2e332947ce2145b587c5bdcd075.tar.gz | |
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.
(cherry picked from commit 1741fece7073f51efdd837a4f307ea2cdf3d1cfb)
| -rw-r--r-- | libavformat/flvenc.c | 3 | ||||
| -rw-r--r-- | libavformat/movenc.c | 3 |
2 files changed, 6 insertions, 0 deletions
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 2ee21e544d..780e044bd0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3178,8 +3178,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); } |