[SCM] libav/experimental: maybe fixing a segfault

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:54:37 UTC 2013


The following commit has been merged in the experimental branch:
commit bc9a459780178ec17a2b1e5f7d8f76fad3c2c156
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jan 3 11:32:02 2007 +0000

    maybe fixing a segfault
    
    Originally committed as revision 7407 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 5abc517..f3d4f0f 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -643,6 +643,12 @@ void ff_mspel_motion(MpegEncContext *s,
     v_edge_pos = s->v_edge_pos;
     src_x = clip(src_x, -16, s->width);
     src_y = clip(src_y, -16, s->height);
+
+    if(src_x<=-16 || src_x >= s->width)
+        dxy &= ~3;
+    if(src_y<=-16 || src_y >= s->height)
+        dxy &= ~4;
+
     linesize   = s->linesize;
     uvlinesize = s->uvlinesize;
     ptr = ref_picture[0] + (src_y * linesize) + src_x;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list