[SCM] libav/experimental: fix slices when code=0x18, patch by Michael Niedermayer <michael at mplayer.dev.hu>

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


The following commit has been merged in the experimental branch:
commit 3046f265b9a12928c2cdd2226f1a78ef5e2bf937
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jan 8 00:21:41 2002 +0000

    fix slices when code=0x18, patch by Michael Niedermayer <michael at mplayer.dev.hu>
    
    Originally committed as revision 246 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 01e3d54..962bd18 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -675,6 +675,16 @@ int msmpeg4_decode_mb(MpegEncContext *s,
                     1024, s->mb_width);
             memsetw(&s->dc_val[2][(1) + (s->mb_y) * wrap], 
                     1024, s->mb_width);
+            
+            /* reset AC pred (set previous line to 0) */
+            wrap = s->mb_width * 2 + 2;
+            memsetw(s->ac_val[0][0] + (1 + (2 * s->mb_y) * wrap)*16,
+                    0, 2 * s->mb_width*16);
+            wrap = s->mb_width + 2;
+            memsetw(s->ac_val[1][0] + (1 + (s->mb_y) * wrap)*16,
+                    0, s->mb_width*16);
+            memsetw(s->ac_val[2][0] + (1 + (s->mb_y) * wrap)*16,
+                    0, s->mb_width*16);
 
             s->first_slice_line = 1;
         } else {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list