From 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 4 Apr 2010 16:32:54 +0000
Subject: 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
---
 configure | 3 ---
 1 file changed, 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__))
-- 
cgit v1.2.3