# HG changeset patch
# User diego
# Date 1270398774 0
# Node ID 1987b39652f6f856833ed8c74b0a953b05484454
# Parent  90e5e4e817d1837d8e53f9bcc5f29afefd30223a
Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak.
FFmpeg now builds with the software scaler enabled by default.

diff -r 90e5e4e817d1 -r 1987b39652f6 configure
--- a/configure	Sun Apr 04 16:21:07 2010 +0000
+++ b/configure	Sun Apr 04 16:32:54 2010 +0000
@@ -8730,8 +8730,6 @@
 CONFIG_MLIB = $_mlib
 CONFIG_MUXERS=$_mencoder
 CONFIG_POSTPROC = yes
-# Prevent building libavcodec/imgresample.c with conflicting symbols
-CONFIG_SWSCALE=yes
 CONFIG_VDPAU=$_vdpau
 CONFIG_XVMC=$_xvmc
 CONFIG_ZLIB=$_zlib
@@ -9200,7 +9198,6 @@
 #define CONFIG_LIBVORBIS 0
 #define CONFIG_POWERPC_PERF 0
 #define CONFIG_SMALL 0
-#define CONFIG_SWSCALE 1
 #define CONFIG_SWSCALE_ALPHA 1
 
 #if defined(HAVE_AF_INET6) && (!defined(_WIN32) || defined(__CYGWIN__))