diff options
| author | Rodeo <[email protected]> | 2014-05-13 20:26:56 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-05-13 20:26:56 +0000 |
| commit | a863af56c4e552bc77e308e6e009db9f11730f5c (patch) | |
| tree | ec3600eba9140d48ba2d3da47f5720d64d26bbc3 /contrib | |
| parent | 8c24585a7d379315f0cf823e8b58e007abfc3fe1 (diff) | |
Bump x265 to version 1.0
Miscellaneous bugfixes and performance improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6185 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x265/A01-x265-multiple-inclusion.patch | 12 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 5 |
2 files changed, 4 insertions, 13 deletions
diff --git a/contrib/x265/A01-x265-multiple-inclusion.patch b/contrib/x265/A01-x265-multiple-inclusion.patch index b88a7e0ee..e69de29bb 100644 --- a/contrib/x265/A01-x265-multiple-inclusion.patch +++ b/contrib/x265/A01-x265-multiple-inclusion.patch @@ -1,12 +0,0 @@ -diff -r 527d03c56d68 source/x265.h ---- a/source/x265.h Tue Mar 04 03:13:00 2014 +0530 -+++ b/source/x265.h Fri Mar 14 16:08:12 2014 +0100 -@@ -240,7 +240,7 @@ - int height[3]; - } x265_cli_csp; - --const x265_cli_csp x265_cli_csps[] = -+static const x265_cli_csp x265_cli_csps[] = - { - { 1, { 0, 0, 0 }, { 0, 0, 0 } }, /* i400 */ - { 3, { 0, 1, 1 }, { 0, 1, 1 } }, /* i420 */ diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index e744549a8..4ffe7c5e3 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,X265,x265,YASM)) $(eval $(call import.CONTRIB.defs,X265)) -X265.FETCH.url = http://download.handbrake.fr/contrib/x265-6356-527d03c56d68-0.8.tar.bz2 +X265.FETCH.url = http://download.handbrake.fr/contrib/x265-6801-cea97c4d7945-1.0.tar.bz2 X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" @@ -11,6 +11,9 @@ X265.CONFIGURE.shared = -DENABLE_SHARED=OFF X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF ifeq (1,$(BUILD.cross)) + ifeq (mingw,$(BUILD.system)) + X265.CONFIGURE.extra += -DWIN32=ON -DWINXP_SUPPORT=ON + endif X265.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265.CONFIGURE.host)" X265.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.build)" else |