Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavfilter / libmpcodecs / vf_eq2.c

diff --git a/ffmpeg/libavfilter/libmpcodecs/vf_eq2.c b/ffmpeg/libavfilter/libmpcodecs/vf_eq2.c
index 03568139f33d4d7ecbb9e99b1dcccfe32793b937..d0a2b923c5a43666686d0d48d521918c6220bcd3 100644 (file)
--- a/ffmpeg/libavfilter/libmpcodecs/vf_eq2.c
+++ b/ffmpeg/libavfilter/libmpcodecs/vf_eq2.c
@@ -120,7 +120,7 @@ void create_lut (eq2_param_t *par)
   par->lut_clean = 1;
 }
 
-#if HAVE_MMX && HAVE_6REGS
+#if HAVE_MMX_INLINE && HAVE_6REGS
 static
 void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src,
   unsigned w, unsigned h, unsigned dstride, unsigned sstride)
@@ -289,7 +289,7 @@ void check_values (eq2_param_t *par)
   if ((par->c == 1.0) && (par->b == 0.0) && (par->g == 1.0)) {
     par->adjust = NULL;
   }
-#if HAVE_MMX && HAVE_6REGS
+#if HAVE_MMX_INLINE && HAVE_6REGS
   else if (par->g == 1.0 && ff_gCpuCaps.hasMMX) {
     par->adjust = &affine_1d_MMX;
   }