aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-03-26 15:16:07 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-03-27 00:56:35 +0100
commitfe995dcd84c6e2aca3216a10a996ecfbba964b6c (patch)
tree08ef809ea578075b22178dc052d348b78cd1f829 /libavformat
parent9b481654e1513475b133b45677d85516080d64fb (diff)
downloadffmpeg-fe995dcd84c6e2aca3216a10a996ecfbba964b6c.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)
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/flvenc.c3
-rw-r--r--libavformat/movenc.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 97c00bf79e..5447840b2a 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -492,10 +492,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 bistream 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 5bf5a7408f..18dbffa8cc 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3097,8 +3097,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);
}