[vlc-commits] commit: Revert "Disable swscale if avcodec is disabled" because the swscale doesn't need it anymore since [ 5f919fba48847669640f999dd72bb32df2cd17b8] (Jean-Baptiste Kempf )

git at videolan.org git at videolan.org
Thu Jul 22 17:53:02 CEST 2010


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul 22 17:38:32 2010 +0200| [edf7b0004d4844f72163244d0870fddb6e886830] | committer: Jean-Baptiste Kempf 

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.

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

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

diff --git a/configure.ac b/configure.ac
index 111c7f8..6a64f83 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],



More information about the vlc-commits mailing list