From e1838bbaf5cded8874f78fe1b88f7d359b285911 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Wed, 15 Jan 2014 04:46:33 +0000
Subject: [PATCH] #415: switch to ffmpeg2 by default for win32 builds

git-svn-id: https://xpra.org/svn/Xpra/trunk@5188 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 src/win32/MAKE-INSTALLER.BAT | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/win32/MAKE-INSTALLER.BAT b/src/win32/MAKE-INSTALLER.BAT
index 38eef5a50d..884b3d0094 100644
--- a/src/win32/MAKE-INSTALLER.BAT
+++ b/src/win32/MAKE-INSTALLER.BAT
@@ -23,8 +23,8 @@ SET SHOW_DEPENDENCIES=0
 
 REM "SET THESE TO 0 TO DISABLE VPX/RENCODE/CLIPBOARD/etc:"
 SET ENC_X264=1
-SET DEC_AVCODEC=1
-SET DEC_AVCODEC2=0
+SET DEC_AVCODEC=0
+SET DEC_AVCODEC2=1
 SET CSC_NVCUDA=0
 SET NVENC=0
 SET VPX=1
@@ -74,7 +74,7 @@ SET BUILD_ARGS=
 
 IF %ENC_X264% NEQ 1 SET BUILD_ARGS=%BUILD_ARGS% --without-enc_x264
 IF %DEC_AVCODEC% NEQ 1 SET BUILD_ARGS=%BUILD_ARGS% --without-dec_avcodec
-IF %DEC_AVCODEC2%==1 SET BUILD_ARGS=%BUILD_ARGS% --with-dec_avcodec2
+IF %DEC_AVCODEC2% EQU 1 SET BUILD_ARGS=%BUILD_ARGS% --with-dec_avcodec2
 IF %CSC_NVCUDA% NEQ 1 SET BUILD_ARGS=%BUILD_ARGS% --without-csc_nvcuda
 IF %NVENC% NEQ 1 SET BUILD_ARGS=%BUILD_ARGS% --without-nvenc
 IF %VPX% NEQ 1 SET BUILD_ARGS=%BUILD_ARGS% --without-vpx
@@ -96,10 +96,11 @@ ECHO ****** ensure Visual Studio env is available
 if "%VSINSTALLDIR%"=="" (
 	call "%VC%\bin\vcvars32.bat"
 )
-
+
 ECHO ***************************************************************
 ECHO ****** build cython pyd files inplace
-
SET CYTHON_ARGS=%BUILD_ARGS%
+
+SET CYTHON_ARGS=%BUILD_ARGS%
 IF %DEBUG% EQU 1 SET CYTHON_ARGS=%BUILD_ARGS% --pyrex-gdb
 
 ECHO %PYTHON_EXE% -OO setup.py build_ext %CYTHON_ARGS% --inplace