Imported Debian version 2.5.0~trusty1.1

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

diff --git a/ffmpeg/libavfilter/libmpcodecs/vf_ilpack.c b/ffmpeg/libavfilter/libmpcodecs/vf_ilpack.c
index fbf58170624ae5ade66004987b7097dffab1ee29..d92b0aef13d57ee9ef0c1445239ca66f7a017d35 100644 (file)
--- a/ffmpeg/libavfilter/libmpcodecs/vf_ilpack.c
+++ b/ffmpeg/libavfilter/libmpcodecs/vf_ilpack.c
@@ -78,7 +78,7 @@ static void pack_li_1_C(unsigned char *dst, unsigned char *y,
     }
 }
 
-#if HAVE_MMX
+#if HAVE_MMX_INLINE
 static void pack_nn_MMX(unsigned char *dst, unsigned char *y,
     unsigned char *u, unsigned char *v, int w,
     int av_unused us, int av_unused vs)
@@ -420,7 +420,7 @@ static int vf_open(vf_instance_t *vf, char *args)
     pack_nn = pack_nn_C;
     pack_li_0 = pack_li_0_C;
     pack_li_1 = pack_li_1_C;
-#if HAVE_MMX
+#if HAVE_MMX_INLINE
     if(ff_gCpuCaps.hasMMX) {
         pack_nn = pack_nn_MMX;
 #if HAVE_EBX_AVAILABLE