diff options
author | rhester <[email protected]> | 2006-09-30 16:21:26 +0000 |
---|---|---|
committer | rhester <[email protected]> | 2006-09-30 16:21:26 +0000 |
commit | 1806e33ca8df880e33657d3a30e537ae620fadef (patch) | |
tree | 69482a657f855d09d669e94ec0bd3251d6092406 /contrib/patch-x264-macintel.patch | |
parent | 5f8684be8ecc912a8828ae3c21857125255a590b (diff) |
HandBrake 0.7.1a1
Made H.264 baseline levels more generic
Added iPod 640x480 support to libhb, HBTest and MacOS X GUI
Added proper iPod 640x480 muxing
Modified rate control for more accurate ending video bitrates
Updated ffmpeg and x264 base sources to more current levels
Removed inlined ff_get_fourcc (now in ffmpeg)
Updated patches for xvidcore, libdvdread, x264, and ffmpeg
Relocated contrib files to local web server and updated version files to new site
Renamed contrib files and patches to consistent naming standard
Updated contrib Jamfile to support new patches and naming standard
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@70 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/patch-x264-macintel.patch')
-rw-r--r-- | contrib/patch-x264-macintel.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/contrib/patch-x264-macintel.patch b/contrib/patch-x264-macintel.patch new file mode 100644 index 000000000..b2219fd9d --- /dev/null +++ b/contrib/patch-x264-macintel.patch @@ -0,0 +1,48 @@ +--- x264/common/i386/i386inc.asm 2006-09-23 14:01:05.000000000 -0400 ++++ x264-patched/common/i386/i386inc.asm 2006-09-24 09:21:27.000000000 -0400 +@@ -40,12 +40,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 +- fakegot: +- %else ++; %ifidn __OUTPUT_FORMAT__,macho ++; SECTION .text ++; fakegot: ++; %else + SECTION .rodata data 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 + + ;----------------------------------------------------------------------------- |