From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Fri, 4 Dec 2009 10:45:19 +0000 (+0100)
Subject: Merge FFmpeg on Windows
X-Git-Tag: 1.1.0-ff~2236
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e222f54ca8846d93b72447ed73c1399a6e7c8850;p=vlc

Merge FFmpeg on Windows
---

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 8fd467def8..1fe17b6a88 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 \