Revert x264 back

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2@323 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/patch-x264-cygwin.patch b/contrib/patch-x264-cygwin.patch
index c03fdf7199540234d191c831237c47448346463d..73b6ae03e03fbd56bc873e569aaafdba7bef5710 100644 (file)
--- a/contrib/patch-x264-cygwin.patch
+++ b/contrib/patch-x264-cygwin.patch
@@ -8,7 +8,7 @@ diff -Naur x264/configure x264-patched/configure
 -    CFLAGS="$CFLAGS -mno-cygwin"
 -    LDFLAGS="$LDFLAGS -mno-cygwin"
 +    #CFLAGS="$CFLAGS -mno-cygwin"
-+    #LDFLAGS="$LDFLAGS -mno-cygwin"
++    #LDFLAGS="$LDFLAGS -mno-cygwin" 
      EXE=".exe"
      DEVNULL="NUL"
      ;;

diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt
index b762a7a35a4a00141bd3fd06456a4e42bdb821aa..07b95e8ddb0e72d0d9e1d152fe9fee295644440d 100644 (file)
--- a/contrib/version_x264.txt
+++ b/contrib/version_x264.txt
@@ -1 +1,5 @@
+<<<<<<< .mine
+http://download.mediafork.dynalias.com/contrib/x264-r604.tar.gz 
+=======
 http://download.handbrake.dynalias.com/contrib/x264-r618.tar.gz
+>>>>>>> .r322