[SCM] libav/experimental: segfault fix

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:40:42 UTC 2013


The following commit has been merged in the experimental branch:
commit 6258c7e6749278cadae7971d1f2c1f340a39a0d4
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jun 19 00:10:21 2004 +0000

    segfault fix
    
    Originally committed as revision 3236 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index e064626..442839c 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -453,8 +453,9 @@ static int svq3_decode_mb (H264Context *h, unsigned int mb_type) {
 
       mb_type = MB_TYPE_SKIP;
     } else {
-      svq3_mc_dir (h, s->next_picture.mb_type[mb_xy], PREDICT_MODE, 0, 0);
-      svq3_mc_dir (h, s->next_picture.mb_type[mb_xy], PREDICT_MODE, 1, 1);
+      mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 0);
+      svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0);
+      svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1);
 
       mb_type = MB_TYPE_16x16;
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list