X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fpackage%2Fwin32%2Fconfigure-common.sh;h=55066313b9293ed884903d3c3b20eaa760ca746b;hb=a94dd37ee15a7e9d54aeb27991431bd0bdf3696c;hp=3ffece069ef76e764c6b67ae1e10057d2aaf7b00;hpb=1f952b3d3380ebb606f03c452b635461cfd69283;p=vlc

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 3ffece069e..55066313b9 100755
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -8,7 +8,7 @@
       --enable-twolame \
       --enable-quicktime \
       --enable-real \
-      --enable-avcodec \
+      --enable-avcodec  --enable-merge-ffmpeg \
       --enable-dca \
       --enable-mpc \
       --enable-libass \
@@ -19,15 +19,14 @@
       --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
       --enable-shout \
       --enable-goom \
-      --enable-caca --with-caca-config-path=/usr/win32/bin \
+      --enable-caca \
       --enable-portaudio \
       --enable-sdl --with-sdl-config-path=/usr/win32/bin \
       --enable-qt4 \
-      --enable-mozilla --with-mozilla-sdk-path=/usr/win32/gecko-sdk \
       --enable-activex \
       --enable-sse --enable-mmx \
-      --disable-fluidsynth \
-      --disable-gnomevfs --disable-hal \
-      --disable-cddax --disable-vcdx --disable-libcdio --disable-vcdinfo \
-      --disable-libcddb --disable-dvb --enable-zvbi --disable-telx \
-      --disable-pulse
+      --enable-libcddb \
+      --enable-zvbi --disable-telx \
+      --disable-dvb \
+      --disable-sqlite \
+      --enable-peflags