diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2010-07-31 16:17:54 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2010-07-31 16:17:54 +0000 |
| commit | 0913a92a59cc5a63c0a1d336c86e62d8c67828c5 (patch) | |
| tree | 8976959f94668844b26ef7131ac7f63e16f557db | |
| parent | 1de4cfe6357c93bb2c01a6d48c93f978551e0aa7 (diff) | |
| download | ffmpeg-0913a92a59cc5a63c0a1d336c86e62d8c67828c5.tar.gz | |
Fix compilation with --disable-yasm. 10l to me.
Originally committed as revision 24617 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/imgconvert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 1fb8f7e5d7..2159216890 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, |