summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-04 16:32:54 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-04 16:32:54 +0000
commit00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (patch)
tree5c57658d2a2b7d87a4094bfc4a59e8c3b34b7ccc /configure
parent275efd21b17b25c654fcea78415c795d46730ba3 (diff)
downloadmpv-00959d5cf76d4ad94de9d0022b7b40a58acf2b95.tar.bz2
mpv-00959d5cf76d4ad94de9d0022b7b40a58acf2b95.tar.xz
Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak.
FFmpeg now builds with the software scaler enabled by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31004 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 0 insertions, 3 deletions
diff --git a/configure b/configure
index 29dba495d7..76cff01811 100755
--- a/configure
+++ b/configure
@@ -8730,8 +8730,6 @@ CONFIG_LIBXVID_ENCODER=$_xvid_lavc
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 @@ $def_yasm
#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__))