Mercurial > libavcodec.hg

changeset 12317:0046ee0d227c libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation with --disable-yasm. 10l to me.
author vitor
date Sat, 31 Jul 2010 16:17:54 +0000
parents b01d01738bc4
children 4cd8be946006
files imgconvert.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/imgconvert.c	Sat Jul 31 14:50:51 2010 +0000
+++ b/imgconvert.c	Sat Jul 31 16:17:54 2010 +0000
@@ -38,7 +38,7 @@
 #include "libavutil/pixdesc.h"
 #include "libavcore/imgutils.h"
 
-#if HAVE_MMX
+#if HAVE_MMX && HAVE_YASM
 #include "x86/dsputil_mmx.h"
 #endif
 
@@ -54,7 +54,7 @@
 #define FF_PIXEL_PACKED   1 /**< only one components containing all the channels */
 #define FF_PIXEL_PALETTE  2  /**< one components containing indexes for a palette */
 
-#if HAVE_MMX
+#if HAVE_MMX && HAVE_YASM
 #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx
 #define deinterlace_line         ff_deinterlace_line_mmx
 #else
@@ -1126,7 +1126,7 @@
     return ret;
 }
 
-#if !HAVE_MMX
+#if !(HAVE_MMX && HAVE_YASM)
 /* filter parameters: [-1 4 2 4 -1] // 8 */
 static void deinterlace_line_c(uint8_t *dst,
                              const uint8_t *lum_m4, const uint8_t *lum_m3,