* extras/contrib/Makefile, Patches/x264-svn-win32.patch: x264 win32 build fix.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0983f0b262a9068ea328323732f1e6dbb5662627..c5f0dd321f7ae0facf58181c395a3beb357e96fe 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -86,7 +86,7 @@ HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib
 # For libebml/libmatroska. Grrr.
 HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR="$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib
 FFMPEGCONF=--cross-prefix=$(HOST)-
-X264CONF=--cross-prefix=$(HOST)
+X264CONF=--crosscompile=$(HOST)
 LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o"
 RANLIB=$(HOST)-ranlib
 else

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
index 504a9c85b8fbf58fe5f1ece9815dc9f288f00663..631f1861386fd90dca19868b4ceaea0b0407fee6 100644 (file)
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ b/extras/contrib/src/Patches/x264-svn-win32.patch
@@ -255,7 +255,7 @@ Index: common/i386/mc-a2.asm
 +          CC="$CROSS-gcc"
 +          AR="$CROSS-ar"
 +          RANLIB="$CROSS-ranlib"
-+          UNAMES="`echo $CROSS | cut -d- -f3`"
++          UNAMES="`echo $CROSS | cut -d- -f2`"
 +          UNAMEM="`echo $CROSS | cut -d- -f1`"
 +          ;;
 +      --prefix=*)