pixman: Branch 'master'

[Matt Turner]

 pixman/pixman-mmx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4fc586c3df9a53cc1406891e751a6eed3d7da400
Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Feb 21 16:28:37 2012 -0500

    mmx: fix typo in pix_add_mul on MSVC
    
    Typo introduced in commit a075a870.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 48fc665..09b2077 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -464,7 +464,7 @@ pix_add_mul (__m64 x, __m64 a, __m64 y, __m64 b)
 
 #define pix_add_mul(x, a, y, b)	 \
     ( x = pix_multiply (x, a),	 \
-      y = pix_multiply (y, a),	 \
+      y = pix_multiply (y, b),	 \
       pix_add (x, y) )
 
 #endif