[SCM] libav/experimental: * fixing DV-in-AVI type1 packet production bug

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:47:21 UTC 2013


The following commit has been merged in the experimental branch:
commit c4e7baa85cb833db55661670e3b56c8dca45dbe3
Author: Roman Shaposhnik <roman at shaposhnik.org>
Date:   Sat Apr 1 23:13:53 2006 +0000

      * fixing DV-in-AVI type1 packet production bug
    
    Originally committed as revision 5262 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 88680fc..bec1759 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 */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list