From 0913a92a59cc5a63c0a1d336c86e62d8c67828c5 Mon Sep 17 00:00:00 2001
From: Vitor Sessak <vitor1001@gmail.com>
Date: Sat, 31 Jul 2010 16:17:54 +0000
Subject: [PATCH] Fix compilation with --disable-yasm. 10l to me.
Originally committed as revision 24617 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/imgconvert.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 1fb8f7e5d72..2159216890f 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -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 *src,
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,
--
GitLab