# HG changeset patch # User gpoirier # Date 1121195764 0 # Node ID e4360060b79ae85865adf3bc4a1fb0acba72a00e # Parent 1cde99dbc0f979e14c66b2bca0188ba651e528ff Re-enables the GCC-4 fix for AMD-64 only. Patch by cartman and poirierg diff -r 1cde99dbc0f9 -r e4360060b79a postproc/swscale_template.c --- a/postproc/swscale_template.c Tue Jul 12 09:09:21 2005 +0000 +++ b/postproc/swscale_template.c Tue Jul 12 19:16:04 2005 +0000 @@ -2547,7 +2547,13 @@ "cmp %2, %%"REG_a" \n\t" " jb 1b \n\t" +/* GCC-3.3 makes MPlayer crash on IA-32 machines when using "g" operand here, + which is needed to support GCC-4.0 */ +#if defined(ARCH_X86_64) && ((__GNUC__ > 3) || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4)) + :: "m" (src1), "m" (dst), "g" ((long)dstWidth), "m" (xInc_shr16), "m" (xInc_mask), +#else :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" (xInc_shr16), "m" (xInc_mask), +#endif "r" (src2) : "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi" );