diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 034effe..4543958 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -320,9 +320,7 @@ OBJS-$(HAVE_BEOSTHREADS)               += beosthread.o

 OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o

-ifneq ($(CONFIG_SWSCALER),yes)
 OBJS += imgresample.o
-endif

 # processor-specific code
 ifeq ($(TARGET_MMX),yes)
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 7fe88c8..cfc4e96 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -2336,7 +2336,6 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width,
 }
 #endif

-#ifndef CONFIG_SWSCALER
 /* XXX: always use linesize. Return -1 if not supported */
 int img_convert(AVPicture *dst, int dst_pix_fmt,
                 const AVPicture *src, int src_pix_fmt,
@@ -2578,7 +2577,6 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
     avpicture_free(tmp);
     return ret;
 }
-#endif

 /* NOTE: we scan all the pixels to have an exact information */
 static int get_alpha_info_pal8(const AVPicture *src, int width, int height)