[vlc-commits] configure.sh: Don't force enable twolame & x264

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Jul 17 10:40:18 2018 +0200| [5217f5be871592c1ec280a161496bd5f8bbeffa3] | committer: Hugo Beauzée-Luyssen

configure.sh: Don't force enable twolame & x264

They will be enabled if the dependency is there. This fixes builds with
configure.sh & --disable-sout

(cherry picked from commit e5f06a0538a8b281f4ec3dc85d0c4cd3e61015de)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 extras/package/win32/configure.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extras/package/win32/configure.sh b/extras/package/win32/configure.sh
index b9eefa4294..953b1332e0 100755
--- a/extras/package/win32/configure.sh
+++ b/extras/package/win32/configure.sh
@@ -6,12 +6,10 @@ OPTIONS="
       --enable-faad
       --enable-flac
       --enable-theora
-      --enable-twolame
       --enable-avcodec --enable-merge-ffmpeg
       --enable-dca
       --enable-mpc
       --enable-libass
-      --enable-x264
       --enable-schroedinger
       --enable-realrtsp
       --enable-live555