From 0c9765d4cea006b2630be02fea85a8ccae46b6fa Mon Sep 17 00:00:00 2001 From: prigaux Date: Tue, 13 Feb 2007 21:49:03 +0000 Subject: [PATCH] Revert x264 back git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2@323 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/patch-x264-cygwin.patch | 2 +- contrib/version_x264.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/patch-x264-cygwin.patch b/contrib/patch-x264-cygwin.patch index c03fdf719..73b6ae03e 100644 --- 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 b762a7a35..07b95e8dd 100644 --- 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 -- 2.40.0