aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-05-24 15:32:03 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2011-05-24 15:32:03 -0400
commita724ee6265bbf0acf4c43cd948dede661459727d (patch)
treed747e90e2104c27c72fcfe7f9f9928dc1627789c
parent1bb0f0c925d616375b3b991d9c645e170b90c0a4 (diff)
downloadffmpeg-a724ee6265bbf0acf4c43cd948dede661459727d.tar.gz
swscale: unbreak the build on non-x86 systems.
-rw-r--r--libswscale/swscale_template.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 0ff402806e..cd6c8c7a65 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -661,7 +661,9 @@ static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[],
if (!enough_lines)
break; //we can't output a dstY line so let's try with the next slice
- if (HAVE_MMX) updateMMXDitherTables(c, dstY, lumBufIndex, chrBufIndex, lastInLumBuf, lastInChrBuf);
+#if HAVE_MMX
+ updateMMXDitherTables(c, dstY, lumBufIndex, chrBufIndex, lastInLumBuf, lastInChrBuf);
+#endif
if (dstY < dstH-2) {
const int16_t **lumSrcPtr= (const int16_t **) lumPixBuf + lumBufIndex + firstLumSrcY - lastInLumBuf + vLumBufSize;
const int16_t **chrSrcPtr= (const int16_t **) chrPixBuf + chrBufIndex + firstChrSrcY - lastInChrBuf + vChrBufSize;
@@ -786,8 +788,10 @@ static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[],
if ((dstFormat == PIX_FMT_YUVA420P) && !alpPixBuf)
fillPlane(dst[3], dstStride[3], dstW, dstY-lastDstY, lastDstY, 255);
- if (HAVE_MMX2 && av_get_cpu_flags() & AV_CPU_FLAG_MMX2)
+#if HAVE_MMX2
+ if (av_get_cpu_flags() & AV_CPU_FLAG_MMX2)
__asm__ volatile("sfence":::"memory");
+#endif
emms_c();
/* store changed local vars back in the context */