changeset 30962:1987b39652f6

Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak. FFmpeg now builds with the software scaler enabled by default.
author diego
date Sun, 04 Apr 2010 16:32:54 +0000
parents 90e5e4e817d1
children e9eedc6fa642
files configure
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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__))