Imported Debian version 2.5.0~trusty1.1

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

diff --git a/ffmpeg/libavfilter/libmpcodecs/vf_pp7.c b/ffmpeg/libavfilter/libmpcodecs/vf_pp7.c
index 89ed4fe679c0d4e4324549ffcdbcc9f4cfe20155..0283e5d4e346324381409e5dc527e4e3d0d00ba2 100644 (file)
--- a/ffmpeg/libavfilter/libmpcodecs/vf_pp7.c
+++ b/ffmpeg/libavfilter/libmpcodecs/vf_pp7.c
@@ -155,7 +155,7 @@ static void dctB_c(int16_t *dst, int16_t *src){
     }
 }
 
-#if HAVE_MMX
+#if HAVE_MMX_INLINE
 static void dctB_mmx(int16_t *dst, int16_t *src){
     __asm__ volatile (
         "movq  (%0), %%mm0      \n\t"
@@ -397,10 +397,10 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
         memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]);
     }
 
-#if HAVE_MMX
+#if HAVE_MMX_INLINE
     if(ff_gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t");
 #endif
-#if HAVE_MMX2
+#if HAVE_MMXEXT_INLINE
     if(ff_gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t");
 #endif
 
@@ -464,7 +464,7 @@ static int vf_open(vf_instance_t *vf, char *args){
         case 2: requantize= mediumthresh_c; break;
     }
 
-#if HAVE_MMX
+#if HAVE_MMX_INLINE
     if(ff_gCpuCaps.hasMMX){
         dctB= dctB_mmx;
     }