summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authoreddyg <[email protected]>2007-11-29 21:56:21 +0000
committereddyg <[email protected]>2007-11-29 21:56:21 +0000
commita4f3c4afea2f5f40dfedbab4cc7b2b6be259fc8d (patch)
tree20239aa3fd7a029cfd2fb9a19441f4b94e2fb73f /contrib
parent83cd1612adcdb03d46e01e7149e6f18137059c53 (diff)
Fix Solaris 10 compilation in new version of x264 with modified patch file
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1087 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/patch-x264-solaris.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/patch-x264-solaris.patch b/contrib/patch-x264-solaris.patch
index 09e3f6025..ed830149f 100644
--- a/contrib/patch-x264-solaris.patch
+++ b/contrib/patch-x264-solaris.patch
@@ -16,17 +16,16 @@
then
ECHON="printf"
-diff -Naur x264/encoder/ratecontrol.c solaris.x264/encoder/ratecontrol.c
---- x264/encoder/ratecontrol.c 2007-05-01 22:45:01.000000000 +0200
-+++ solaris.x264/encoder/ratecontrol.c 2007-07-08 15:08:46.037119995 +0200
-@@ -35,6 +35,9 @@
- #include "common/cpu.h"
- #include "ratecontrol.h"
+--- x264/common/osdep.h Thu Nov 22 06:00:24 2007
++++ x264.modified/common/osdep.h Fri Nov 30 10:23:28 2007
+@@ -44,6 +44,9 @@
+ #define X264_VERSION "" // no configure script for msvc
+ #endif
+#if defined(SYS_SunOS)
+#define isfinite _finite
+#endif
- #if defined(SYS_OPENBSD)
+ #ifdef SYS_OPENBSD
#define isfinite finite
#endif
--- x264.base/Makefile Mon Jul 16 08:45:03 2007