Revert x264 back

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

diff --git a/MacOsXContribBinariesVersion.txt b/MacOsXContribBinariesVersion.txt
index e224381915e7ac7c2e298038e1359550c7b597ba..edd6487e02af4024b47bd1893963f6f6c002ad93 100644 (file)
--- a/MacOsXContribBinariesVersion.txt
+++ b/MacOsXContribBinariesVersion.txt
@@ -1 +1 @@
-0004
+0005

diff --git a/Makefile b/Makefile
index b4b720528f79ce3e4574df8519e843024c05c274..226bb44467ee754330db7ba92597f6fd6eba136d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SYSTEM = $(shell uname -s)
 # Special case for Mac OS X: everything is handled from the Xcode project
 ifeq ($(SYSTEM),Darwin)
 
-all:    clean app release
+all:    clean app
 
 app:
        (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app)

diff --git a/contrib/patch-x264-cygwin.patch b/contrib/patch-x264-cygwin.patch
index c03fdf7199540234d191c831237c47448346463d..40a14fa4498541fe17030178e70b2d985612b7b3 100644 (file)
--- a/contrib/patch-x264-cygwin.patch
+++ b/contrib/patch-x264-cygwin.patch
@@ -1,7 +1,7 @@
 diff -Naur x264/configure x264-patched/configure
---- x264/configure     2007-01-14 12:30:22.000000000 -0500
-+++ x264-patched/configure     2007-01-14 13:37:18.078125000 -0500
-@@ -113,8 +113,8 @@
+--- x264/configure     2007-01-01 17:01:36.609375000 -0500
++++ x264-patched/configure     2007-01-01 17:02:36.468750000 -0500
+@@ -96,8 +96,8 @@
      ;;
    cygwin*)
      SYS="CYGWIN"

diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt
index b762a7a35a4a00141bd3fd06456a4e42bdb821aa..8080840f35b5064be0d5dc9b2f4e0a028c932354 100644 (file)
--- a/contrib/version_x264.txt
+++ b/contrib/version_x264.txt
@@ -1 +1 @@
-http://download.handbrake.dynalias.com/contrib/x264-r618.tar.gz
+http://download.mediafork.dynalias.com/contrib/x264-r604.tar.gz