ffmpeg | branch: release/3.2 | Michael Niedermayer <mich...@niedermayer.cc> | Sat Jul 28 15:03:50 2018 +0200| [1b283238226bf2ff1f328ab4811375240224b346] | committer: Michael Niedermayer
avformat/flvenc: Check audio packet size Fixes: Assertion failure Fixes: assert_flvenc.c:941_1.swf Found-by: #CHEN HONGXU# <hchen...@e.ntu.edu.sg> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b283238226bf2ff1f328ab4811375240224b346 --- libavformat/flvenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e50f8e4519..3bb7a216a4 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -575,6 +575,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *data = NULL; int flags = -1, flags_size, ret; + if (par->codec_type == AVMEDIA_TYPE_AUDIO && !pkt->size) { + av_log(s, AV_LOG_WARNING, "Empty audio Packet\n"); + return AVERROR(EINVAL); + } + if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A || par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC) flags_size = 2; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog