diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-28 15:03:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-04 16:17:01 +0200 |
| commit | 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10 (patch) | |
| tree | 6cc5ea773cb22a05ce4c01582554c22f793de38a | |
| parent | 476fd6ba3a7d74ed8be9af10cb9f4d4b3fdaf3e1 (diff) | |
| download | ffmpeg-6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10.tar.gz | |
avformat/flvenc: Check audio packet size
Fixes: Assertion failure
Fixes: assert_flvenc.c:941_1.swf
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/flvenc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 1c552a3e6b..e4863f1fc7 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -883,6 +883,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) int flags = -1, flags_size, ret; int64_t cur_offset = avio_tell(pb); + 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; |