Merge commit '896fe15dbb7b78de495c4a7dd75e7faec66778da'

[ffmpeg] / libavformat / flvenc.c

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 1c552a3e6b97fa997edc26e8ce6631455f695afd..e4863f1fc73cf1e596080b5e207f702b35a59564 100644 (file)
--- 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;