summaryrefslogtreecommitdiff
path: root/postproc/swscale_template.c
diff options
context:
space:
mode:
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2005-07-12 19:16:04 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2005-07-12 19:16:04 +0000
commitdc77ef7fea979d086176b2cc7e8798b57c1ce9bc (patch)
tree7bb765efa7669783e33a342918f69f5e339acf82 /postproc/swscale_template.c
parentaa6ff39bb093a98b338cee45af77cd6c4055b886 (diff)
Re-enables the GCC-4 fix for AMD-64 only. Patch by cartman and poirierg
Originally committed as revision 15973 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc/swscale_template.c')
-rw-r--r--postproc/swscale_template.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c
index c91e9cd5fa..1a68deecc7 100644
--- a/postproc/swscale_template.c
+++ b/postproc/swscale_template.c
@@ -2547,7 +2547,13 @@ FUNNY_UV_CODE
"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"
);