summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorhandbrake <[email protected]>2006-12-16 05:41:22 +0000
committerhandbrake <[email protected]>2006-12-16 05:41:22 +0000
commitb00de70e59cac3419d7b53cf70bb801c09472c88 (patch)
tree35f0b2ab2cbbbb95d2c9c8a40265c352a3243f81 /contrib
parent1806e33ca8df880e33657d3a30e537ae620fadef (diff)
HandBrake 0.7.1a2
Updated x264 base source to svn 604 Improved CQP and ABR handling git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@71 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/patch-x264-macintel.patch4
-rw-r--r--contrib/version_x264.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/patch-x264-macintel.patch b/contrib/patch-x264-macintel.patch
index b2219fd9d..9a409968c 100644
--- a/contrib/patch-x264-macintel.patch
+++ b/contrib/patch-x264-macintel.patch
@@ -5,11 +5,11 @@
; section instead until NASM is fixed.
%macro SECTION_RODATA 0
- %ifidn __OUTPUT_FORMAT__,macho
-- SECTION .text
+- SECTION .text align=16
- fakegot:
- %else
+; %ifidn __OUTPUT_FORMAT__,macho
-+; SECTION .text
++; SECTION .text align=16
+; fakegot:
+; %else
SECTION .rodata data align=16
diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt
index 9d6f6289f..098252c03 100644
--- a/contrib/version_x264.txt
+++ b/contrib/version_x264.txt
@@ -1 +1 @@
-http://multics.dynalias.com/handbrake/contrib/x264-r568.tar.gz
+http://multics.dynalias.com/handbrake/contrib/x264-r604.tar.gz