Merge FFmpeg on Windows

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 8fd467def86adcfce30d40d07433cf8cc2f79900..1fe17b6a8803df3ac9ef9771ddc56aee30f779c5 100755 (executable)
--- 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 \