[SCM] libav/experimental: Ensure that we don't read from invalid memory with B-frame qpel

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ebcf3b742bcc71355ddc7c1a83bb829425a9f754
Author: David Conrad <lessen42 at gmail.com>
Date:   Fri May 15 07:49:59 2009 +0000

    Ensure that we don't read from invalid memory with B-frame qpel
    
    Originally committed as revision 18839 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 3a5b447..82bf8db 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -1818,8 +1818,8 @@ static void vc1_interp_mc(VC1Context *v)
     }
 
     if(v->rangeredfrm
-       || (unsigned)src_x > s->h_edge_pos - (mx&3) - 16
-       || (unsigned)src_y > s->v_edge_pos - (my&3) - 16){
+       || (unsigned)src_x > s->h_edge_pos - (mx&3) - 16 - s->mspel*3
+       || (unsigned)src_y > s->v_edge_pos - (my&3) - 16 - s->mspel*3){
         uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
 
         srcY -= s->mspel * (1 + s->linesize);

-- 
Libav/FFmpeg packaging