# HG changeset patch
# User lucabe
# Date 1155063098 0
# Node ID 33d29a80bcace23e139c4af004e893faff58cfd1
# Parent  8e13ec0f8aa3e30d0ac26792cb0f15799f0e665a
Enable swscale usage in ffmpeg

diff -r 8e13ec0f8aa3 -r 33d29a80bcac Makefile
--- a/Makefile	Tue Aug 08 12:03:51 2006 +0000
+++ b/Makefile	Tue Aug 08 18:51:38 2006 +0000
@@ -11,7 +11,7 @@
 OBJS= bitstream.o utils.o allcodecs.o \
       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
       mjpeg.o resample.o resample2.o dsputil.o \
-      motion_est.o imgconvert.o imgresample.o \
+      motion_est.o imgconvert.o \
       mpeg12.o mpegaudiodec.o simple_idct.o \
       ratecontrol.o eval.o error_resilience.o \
       fft.o mdct.o raw.o golomb.o cabac.o\
@@ -22,6 +22,9 @@
 
 
 HEADERS = avcodec.h
+ifneq ($(CONFIG_SWSCALER),yes)
+HEADERS += swscale.h
+endif
 
 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o
 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o
@@ -277,6 +280,10 @@
 
 OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
 
+ifneq ($(CONFIG_SWSCALER),yes)
+OBJS += imgresample.o
+endif
+
 # i386 mmx specific stuff
 ifeq ($(TARGET_MMX),yes)
 OBJS += i386/fdct_mmx.o i386/cputest.o \
diff -r 8e13ec0f8aa3 -r 33d29a80bcac imgconvert.c
--- a/imgconvert.c	Tue Aug 08 12:03:51 2006 +0000
+++ b/imgconvert.c	Tue Aug 08 18:51:38 2006 +0000
@@ -2048,6 +2048,7 @@
     return 0;
 }
 
+#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,
@@ -2289,6 +2290,7 @@
     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)