[FFmpeg-cvslog] r24617 - trunk/libavcodec/imgconvert.c

[vitor]

Author: vitor
Date: Sat Jul 31 18:17:54 2010
New Revision: 24617

Log:
Fix compilation with --disable-yasm. 10l to me.

Modified:
   trunk/libavcodec/imgconvert.c

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	Sat Jul 31 17:45:29 2010	(r24616)
+++ trunk/libavcodec/imgconvert.c	Sat Jul 31 18:17:54 2010	(r24617)
@@ -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 @@ int img_get_alpha_info(const AVPicture *
     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,