diff options
author | jbrjake <[email protected]> | 2009-05-26 15:23:21 +0000 |
---|---|---|
committer | jbrjake <[email protected]> | 2009-05-26 15:23:21 +0000 |
commit | 4106a36fa2425ab6eed7d76d0c5861691cd5df17 (patch) | |
tree | eabd80a8e99398b8d546b766f2936f6a93cb05bb /contrib/xvidcore/P00-darwin.patch | |
parent | fdadd571645edc4360f5cd25e3bb45c21a3e65f8 (diff) |
Excises xvid from libhb because it's not worthy. Having two different MPEG-4 Part 2 encoders is superfluous and when choosing between ffmpeg and xvid, xvid is the clear loser since we need to keep ffmpeg around for other functions and xvid constantly requires attention to ensure it compiles.
MacGui: Removes some stray references to the codec and unlinks it from the Xcode project.
CLI: Removes references to the codec and removes it as a dependency.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2448 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/xvidcore/P00-darwin.patch')
-rw-r--r-- | contrib/xvidcore/P00-darwin.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/contrib/xvidcore/P00-darwin.patch b/contrib/xvidcore/P00-darwin.patch deleted file mode 100644 index 12bc8dac0..000000000 --- a/contrib/xvidcore/P00-darwin.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur xvidcore-20090311.orig/build/generic/configure.in xvidcore-20090311/build/generic/configure.in ---- xvidcore-20090311.orig/build/generic/configure.in 2008-12-05 05:18:52.000000000 -0500 -+++ xvidcore-20090311/build/generic/configure.in 2009-04-14 11:30:04.000000000 -0400 -@@ -427,8 +427,13 @@ - MARK_FUNCS="" - ;; - *darwin*) -- AC_MSG_RESULT([macho]) -- NASM_FORMAT="macho" -+ if test "$ARCHITECTURE" = "X86_64" ; then -+ AC_MSG_RESULT([macho64]) -+ NASM_FORMAT="macho64" -+ else -+ AC_MSG_RESULT([macho]) -+ NASM_FORMAT="macho" -+ fi - PREFIX="-DPREFIX" - MARK_FUNCS="" - ;; -diff -Naur xvidcore-20090311.orig/src/nasm.inc xvidcore-20090311/src/nasm.inc ---- xvidcore-20090311.orig/src/nasm.inc 2008-12-05 05:15:02.000000000 -0500 -+++ xvidcore-20090311/src/nasm.inc 2009-04-14 12:13:37.000000000 -0400 -@@ -177,6 +177,8 @@ - %macro TEXT 0 - %ifidn __OUTPUT_FORMAT__,macho - SECTION .text align=SECTION_ALIGN -+%elifidn __OUTPUT_FORMAT__,macho64 -+ SECTION .text align=SECTION_ALIGN - %else - SECTION .rotext align=SECTION_ALIGN - %endif |