[SCM] libav/experimental: 10000l : fix a crash on x86 due to an horrible mistake in my x86_64 patch

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


The following commit has been merged in the experimental branch:
commit a7b42d28da8b680c75db2ecf129e5f438e35797b
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Fri Oct 22 00:21:57 2004 +0000

    10000l : fix a crash on x86 due to an horrible mistake in my x86_64 patch
    
    Originally committed as revision 13734 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c
index ab6c835..5f7a28d 100644
--- a/postproc/swscale_template.c
+++ b/postproc/swscale_template.c
@@ -2049,8 +2049,8 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW
 			"mov %%"REG_a", %%"REG_BP"	\n\t"
 			".balign 16			\n\t"
 			"1:				\n\t"
-			"movzxw (%2, %%"REG_BP"), %%"REG_a"\n\t"
-			"movzxw 2(%2, %%"REG_BP"), %%"REG_b"\n\t"
+			"movzwl (%2, %%"REG_BP"), %%eax	\n\t"
+			"movzwl 2(%2, %%"REG_BP"), %%ebx\n\t"
 			"movq (%1, %%"REG_BP", 4), %%mm1\n\t"
 			"movq 8(%1, %%"REG_BP", 4), %%mm3\n\t"
 			"movd (%3, %%"REG_a"), %%mm0	\n\t"
@@ -2087,8 +2087,8 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW
 			"mov %%"REG_a", %%"REG_BP"	\n\t"
 			".balign 16			\n\t"
 			"1:				\n\t"
-			"movzxw (%2, %%"REG_BP"), %%"REG_a"\n\t"
-			"movzxw 2(%2, %%"REG_BP"), %%"REG_b"\n\t"
+			"movzwl (%2, %%"REG_BP"), %%eax	\n\t"
+			"movzwl 2(%2, %%"REG_BP"), %%ebx\n\t"
 			"movq (%1, %%"REG_BP", 8), %%mm1\n\t"
 			"movq 16(%1, %%"REG_BP", 8), %%mm3\n\t"
 			"movd (%3, %%"REG_a"), %%mm0	\n\t"
@@ -2136,8 +2136,8 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW
 			".balign 16			\n\t"
 			"1:				\n\t"
 			"mov %2, %%"REG_c"		\n\t"
-			"movzxw (%%"REG_c", %0), %%"REG_a"\n\t"
-			"movzxw 2(%%"REG_c", %0), %%"REG_b"\n\t"
+			"movzwl (%%"REG_c", %0), %%eax	\n\t"
+			"movzwl 2(%%"REG_c", %0), %%ebx	\n\t"
 			"mov %5, %%"REG_c"		\n\t"
 			"pxor %%mm4, %%mm4		\n\t"
 			"pxor %%mm5, %%mm5		\n\t"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list