[vlc-devel] commit: Merge FFmpeg on Windows (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Dec  4 11:45:19 2009 +0100| [e222f54ca8846d93b72447ed73c1399a6e7c8850] | committer: Jean-Baptiste Kempf 

Merge FFmpeg on Windows

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

 extras/package/win32/configure-common.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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