[FFmpeg-cvslog] avformat/movenc: Check packet in mov_write_single_packet() too
Michael Niedermayer
git at videolan.org
Sun Sep 18 01:53:42 EEST 2016
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep 15 23:52:54 2016 +0200| [0ffdabb58d3643ef377081074b44e59516ce2f2e] | committer: Michael Niedermayer
avformat/movenc: Check packet in mov_write_single_packet() too
Fixes assertion failure
Found-by: durandal117
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 28343139330f557e00293933a4697c7d0fc19c56)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ffdabb58d3643ef377081074b44e59516ce2f2e
---
libavformat/movenc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 4c93872..e4acf5d 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4567,10 +4567,15 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt)
AVCodecContext *enc = trk->enc;
int64_t frag_duration = 0;
int size = pkt->size;
+ int ret;
if (!pkt->size)
return 0; /* Discard 0 sized packets */
+ ret = check_pkt(s, pkt);
+ if (ret < 0)
+ return ret;
+
if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) {
int i;
for (i = 0; i < s->nb_streams; i++)
More information about the ffmpeg-cvslog
mailing list