From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 22 Jul 2010 15:38:32 +0000 (+0200)
Subject: Revert "Disable swscale if avcodec is disabled" because the swscale doesn't need... 
X-Git-Tag: 1.2.0-pre1~5702
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=edf7b0004d4844f72163244d0870fddb6e886830;p=vlc

Revert "Disable swscale if avcodec is disabled" because the swscale doesn't need it anymore since [5f919fba48847669640f999dd72bb32df2cd17b8]

This reverts commit 964c7e91c0273447e3f830c9aec4d84d602851b9.
Please, do NOT backport this.
---

diff --git a/configure.ac b/configure.ac
index 111c7f8ff0..6a64f83193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2768,9 +2768,7 @@ dnl
 
 AC_ARG_ENABLE(swscale,
   AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion
-		  (default enabled)]),, [
-  enable_swscale="${have_avcodec}"
-])
+		  (default enabled)]))
 if test "${enable_swscale}" != "no"
 then
   PKG_CHECK_MODULES(SWSCALE,[libswscale],