[vlc-commits] commit: Disable swscale if avcodec is disabled ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jul 21 20:25:59 2010 +0300| [619c02299c3bcf1761b1cb61ec96a937cd004017] | committer: Rémi Denis-Courmont 

Disable swscale if avcodec is disabled

(cherry picked from commit 964c7e91c0273447e3f830c9aec4d84d602851b9)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=619c02299c3bcf1761b1cb61ec96a937cd004017
---

 configure.ac |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

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