# HG changeset patch # User reimar # Date 1224518729 0 # Node ID 24761747ac3d6723c51b9b5e20f571d8dcd7e441 # Parent def5fcc1d40eb4f32eb1ee7ecfcdf42c5ae754f7 Use x86_reg type instead of long in float_to_int16 MMX/SSE functions. Fixes compilation on MinGW64. diff -r def5fcc1d40e -r 24761747ac3d i386/dsputil_mmx.c --- a/i386/dsputil_mmx.c Mon Oct 20 09:02:55 2008 +0000 +++ b/i386/dsputil_mmx.c Mon Oct 20 16:05:29 2008 +0000 @@ -2239,6 +2239,7 @@ } static void float_to_int16_3dnow(int16_t *dst, const float *src, long len){ + x86_reg reglen = len; // not bit-exact: pf2id uses different rounding than C and SSE __asm__ volatile( "add %0 , %0 \n\t" @@ -2257,10 +2258,11 @@ "add $16 , %0 \n\t" " js 1b \n\t" "femms \n\t" - :"+r"(len), "+r"(dst), "+r"(src) + :"+r"(reglen), "+r"(dst), "+r"(src) ); } static void float_to_int16_sse(int16_t *dst, const float *src, long len){ + x86_reg reglen = len; __asm__ volatile( "add %0 , %0 \n\t" "lea (%2,%0,2) , %2 \n\t" @@ -2278,11 +2280,12 @@ "add $16 , %0 \n\t" " js 1b \n\t" "emms \n\t" - :"+r"(len), "+r"(dst), "+r"(src) + :"+r"(reglen), "+r"(dst), "+r"(src) ); } static void float_to_int16_sse2(int16_t *dst, const float *src, long len){ + x86_reg reglen = len; __asm__ volatile( "add %0 , %0 \n\t" "lea (%2,%0,2) , %2 \n\t" @@ -2295,7 +2298,7 @@ "movdqa %%xmm0 , (%1,%0) \n\t" "add $16 , %0 \n\t" " js 1b \n\t" - :"+r"(len), "+r"(dst), "+r"(src) + :"+r"(reglen), "+r"(dst), "+r"(src) ); } @@ -2326,6 +2329,7 @@ if(channels==1)\ float_to_int16_##cpu(dst, src[0], len);\ else if(channels==2){\ + x86_reg reglen = len; \ const float *src0 = src[0];\ const float *src1 = src[1];\ __asm__ volatile(\ @@ -2335,7 +2339,7 @@ "add %0, %3 \n"\ "neg %0 \n"\ body\ - :"+r"(len), "+r"(dst), "+r"(src0), "+r"(src1)\ + :"+r"(reglen), "+r"(dst), "+r"(src0), "+r"(src1)\ );\ }else if(channels==6){\ ff_float_to_int16_interleave6_##cpu(dst, src, len);\