From c4e7baa85cb833db55661670e3b56c8dca45dbe3 Mon Sep 17 00:00:00 2001 From: Roman Shaposhnik Date: Sat, 1 Apr 2006 23:13:53 +0000 Subject: [PATCH] * fixing DV-in-AVI type1 packet production bug Originally committed as revision 5262 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/dv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/dv.c b/libavformat/dv.c index 88680fc07c..bec1759202 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -834,8 +834,11 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, { int size, i; - if (buf_size < 4 || buf_size < c->sys->frame_size) - return -1; /* Broken frame, or not enough data */ + if (buf_size < DV_PROFILE_BYTES || + !(c->sys = dv_frame_profile(buf)) || + buf_size < c->sys->frame_size) { + return -1; /* Broken frame, or not enough data */ + } /* Queueing audio packet */ /* FIXME: in case of no audio/bad audio we have to do something */