[SCM] libav/experimental: width,height%16!=0 fix

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 67086c8552ffbdbf5dc4971c9633ea02ca8624ca
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Mar 14 17:33:48 2004 +0000

    width,height%16!=0 fix
    
    Originally committed as revision 2889 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 7d6c2d3..28df554 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -3411,10 +3411,10 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
     if(mb_x*16+16 > s->width || mb_y*16+16 > s->height){
         ff_emulated_edge_mc(s->edge_emu_buffer            , ptr_y , wrap_y,16,16,mb_x*16,mb_y*16, s->width   , s->height);
         ptr_y= s->edge_emu_buffer;
-        ff_emulated_edge_mc(s->edge_emu_buffer+16*wrap_y  , ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
-        ptr_cb= s->edge_emu_buffer+16*wrap_y;
-        ff_emulated_edge_mc(s->edge_emu_buffer+16*wrap_y+8, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
-        ptr_cr= s->edge_emu_buffer+16*wrap_y+8;
+        ff_emulated_edge_mc(s->edge_emu_buffer+18*wrap_y  , ptr_cb, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
+        ptr_cb= s->edge_emu_buffer+18*wrap_y;
+        ff_emulated_edge_mc(s->edge_emu_buffer+18*wrap_y+9, ptr_cr, wrap_c, 8, 8, mb_x*8, mb_y*8, s->width>>1, s->height>>1);
+        ptr_cr= s->edge_emu_buffer+18*wrap_y+9;
     }
 
     if (s->mb_intra) {

-- 
Libav/FFmpeg packaging