diff -p -up ffmpeg/libavcodec/imgconvert.c.reenable-imgresample ffmpeg/libavcodec/imgconvert.c
--- ffmpeg/libavcodec/imgconvert.c.reenable-imgresample	2009-03-02 10:55:52.000000000 +0100
+++ ffmpeg/libavcodec/imgconvert.c	2009-03-02 10:56:54.000000000 +0100
@@ -2196,7 +2196,7 @@ int av_picture_pad(AVPicture *dst, const
     return 0;
 }
 
-#if !CONFIG_SWSCALE
+#if 1
 static uint8_t y_ccir_to_jpeg[256];
 static uint8_t y_jpeg_to_ccir[256];
 static uint8_t c_ccir_to_jpeg[256];
diff -p -up ffmpeg/libavcodec/imgresample.c.reenable-imgresample ffmpeg/libavcodec/imgresample.c
--- ffmpeg/libavcodec/imgresample.c.reenable-imgresample	2009-03-02 10:55:52.000000000 +0100
+++ ffmpeg/libavcodec/imgresample.c	2009-03-02 10:56:54.000000000 +0100
@@ -518,6 +518,7 @@ static const char *context_to_name(void*
     return "imgconvert";
 }
 
+#if 0
 static const AVClass context_class = { "imgresample", context_to_name, NULL };
 
 struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
@@ -695,6 +696,7 @@ the_end:
     return res;
 }
 
+#endif
 
 #ifdef TEST
 #include <stdio.h>
diff -p -up ffmpeg/libavcodec/Makefile.reenable-imgresample ffmpeg/libavcodec/Makefile
--- ffmpeg/libavcodec/Makefile.reenable-imgresample	2009-03-02 10:55:51.000000000 +0100
+++ ffmpeg/libavcodec/Makefile	2009-03-02 10:58:18.000000000 +0100
@@ -29,7 +29,7 @@ OBJS-$(CONFIG_ENCODERS)                +
 OBJS-$(CONFIG_FFT)                     += fft.o
 OBJS-$(CONFIG_GOLOMB)                  += golomb.o
 OBJS-$(CONFIG_MDCT)                    += mdct.o
-OBJS-$(CONFIG_OLDSCALER)               += imgresample.o
+OBJS			               += imgresample.o
 OBJS-$(CONFIG_RDFT)                    += rdft.o
 
 # decoders/encoders