[SCM] libav/experimental: Fix invalid reads in valgrind fate, patch by Daniel Kang <daniel dot d dot kang at gmail com>, as part of Google's GCI 2010.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:21:12 UTC 2013


The following commit has been merged in the experimental branch:
commit 0790caba607c2bb952b405c4840529b82c7cc150
Author: Daniel Kang <daniel.d.kang at gmail.com>
Date:   Fri Dec 31 01:29:06 2010 +0000

    Fix invalid reads in valgrind fate, patch by Daniel Kang <daniel dot d dot
    kang at gmail com>, as part of Google's GCI 2010.
    
    Originally committed as revision 26177 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm
index dd2c499..52e691d 100644
--- a/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@ -2679,10 +2679,10 @@ INIT_MMX
 cglobal pred4x4_horizontal_up_mmxext, 3,3
     sub       r0, r2
     lea       r1, [r0+r2*2]
-    movq      m0, [r0+r2*1-8]
-    punpckhbw m0, [r0+r2*2-8]
-    movq      m1, [r1+r2*1-8]
-    punpckhbw m1, [r1+r2*2-8]
+    movd      m0, [r0+r2*1-4]
+    punpcklbw m0, [r0+r2*2-4]
+    movd      m1, [r1+r2*1-4]
+    punpcklbw m1, [r1+r2*2-4]
     punpckhwd m0, m1
     movq      m1, m0
     punpckhbw m1, m1
@@ -2716,10 +2716,10 @@ cglobal pred4x4_horizontal_down_mmxext, 3,3
     movh      m0, [r0-4]      ; lt ..
     punpckldq m0, [r0]        ; t3 t2 t1 t0 lt .. .. ..
     psllq     m0, 8           ; t2 t1 t0 lt .. .. .. ..
-    movq      m1, [r1+r2*2-8] ; l3
-    punpckhbw m1, [r1+r2*1-8] ; l2 l3
-    movq      m2, [r0+r2*2-8] ; l1
-    punpckhbw m2, [r0+r2*1-8] ; l0 l1
+    movd      m1, [r1+r2*2-4] ; l3
+    punpcklbw m1, [r1+r2*1-4] ; l2 l3
+    movd      m2, [r0+r2*2-4] ; l1
+    punpcklbw m2, [r0+r2*1-4] ; l0 l1
     punpckhwd m1, m2          ; l0 l1 l2 l3
     punpckhdq m1, m0          ; t2 t1 t0 lt l0 l1 l2 l3
     movq      m0, m1

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list