[SCM] libav/experimental: 100l (sad8x8_x2 had params in wrong order)

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


The following commit has been merged in the experimental branch:
commit 843342efb77b1e2545c7f7ea6e6eca37482670b1
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Dec 3 11:07:41 2002 +0000

    100l (sad8x8_x2 had params in wrong order)
    
    Originally committed as revision 1299 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c
index 9b76cdb..3368e73 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -263,6 +263,7 @@ static inline int sum_mmx2()
     return ret;
 }
 
+
 #define PIX_SAD(suf)\
 int pix_abs8x8_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
 {\
@@ -282,7 +283,7 @@ int pix_abs8x8_x2_ ## suf(UINT8 *blk2, UINT8 *blk1, int stride)\
                  :: "m"(round_tab[1]) \
                  );\
 \
-    sad8_2_ ## suf(blk1, blk2+1, blk2, stride, 3);\
+    sad8_2_ ## suf(blk1, blk1+1, blk2, stride, 3);\
 \
     return sum_ ## suf();\
 }\
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 3e324d5..57a19a8 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -15,8 +15,8 @@ a180b84cc43ab6bed7796354385f00c1 *./data/a-odivx.avi
 3a1463cf62c2bee9046870f34400494c *./data/out.yuv
 d64b3c8a7e549b8e32c6101813ad2e02 *./data/a-mpeg4-rc.avi
 f881bf7db273282791c18330bcae338d *./data/out.yuv
-685812396445ac5c79f345965dca6b09 *./data/a-mpeg4-adv.avi
-1d6c3ba2b096ac6df63f1dcabe3ed603 *./data/out.yuv
+b517505ecd37c09656ae12646428da58 *./data/a-mpeg4-adv.avi
+0147bab9d6971eb177457dd096ae8aaf *./data/out.yuv
 2846c8e3d97d7395eb746bfce44e0443 *./data/a-mjpeg.avi
 278033451d7a6bfeb8339abbe4228499 *./data/out.yuv
 bbb398b23e7e69bebf584e6697e3360c *./data/a-rv10.rm

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list