summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/patch-x264-macintel.patch48
-rw-r--r--contrib/version_x264.txt2
2 files changed, 1 insertions, 49 deletions
diff --git a/contrib/patch-x264-macintel.patch b/contrib/patch-x264-macintel.patch
deleted file mode 100644
index 93bc4193f..000000000
--- a/contrib/patch-x264-macintel.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- x264/common/i386/i386inc.asm-old.asm 2007-05-01 16:45:02.000000000 -0400
-+++ x264/common/i386/i386inc.asm 2007-05-02 11:48:52.000000000 -0400
-@@ -42,12 +42,12 @@
- ; is unable to compute address offsets outside of .text so we use the .text
- ; section instead until NASM is fixed.
- %macro SECTION_RODATA 0
-- %ifidn __OUTPUT_FORMAT__,macho
-- SECTION .text align=16
-- fakegot:
-- %else
-+; %ifidn __OUTPUT_FORMAT__,macho
-+; SECTION .text align=16
-+; fakegot:
-+; %else
- SECTION .rodata align=16
-- %endif
-+; %endif
- %endmacro
-
- ; PIC support macros. All these macros are totally harmless when __PIC__ is
---- x264/common/i386/predict-a.asm 2006-09-23 14:01:05.000000000 -0400
-+++ x264-patched/common/i386/predict-a.asm 2006-09-24 09:21:27.000000000 -0400
-@@ -191,7 +191,6 @@
- %assign Y (Y-1)
- movq [edx + Y*FDEC_STRIDE], mm1
-
-- picpop ebx
- ret
-
- ;-----------------------------------------------------------------------------
-@@ -228,7 +227,6 @@
- %assign Y (Y-1)
- movq [edx + Y*FDEC_STRIDE], mm0
-
-- picpop ebx
- ret
-
- ;-----------------------------------------------------------------------------
-@@ -269,8 +267,7 @@
- %endrep
- movq [edx + Y *FDEC_STRIDE], mm3
- movq [edx + (Y+1)*FDEC_STRIDE], mm0
--
-- picpop ebx
-+
- ret
-
- ;-----------------------------------------------------------------------------
diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt
index fd427a4dd..40efa176b 100644
--- a/contrib/version_x264.txt
+++ b/contrib/version_x264.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/x264-r877-c74a8e2.tar.gz
+http://download.m0k.org/handbrake/contrib/x264-r901-58d7d06.tar.gz