[FFmpeg-cvslog] swscale: unbreak the build on non-x86 systems.

Ronald S. Bultje git at videolan.org
Wed May 25 06:37:13 CEST 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Tue May 24 15:32:03 2011 -0400| [a724ee6265bbf0acf4c43cd948dede661459727d] | committer: Ronald S. Bultje

swscale: unbreak the build on non-x86 systems.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a724ee6265bbf0acf4c43cd948dede661459727d
---

 libswscale/swscale_template.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index 0ff4028..cd6c8c7 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 */



More information about the ffmpeg-cvslog mailing list