diff options
| author | jstebbins <[email protected]> | 2015-02-17 20:49:35 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-02-17 20:49:35 +0000 |
| commit | d8b88a234aba9dec5c9c988fbf68028da88b47de (patch) | |
| tree | 0cacdb44e4cff655313f63883aa98a5519ce27b0 /contrib/x265 | |
| parent | ae9996a7898a53090394033625a8906ac0b23c15 (diff) | |
merge x265: bump to version 1.5
many improvements including:
psy-rd(oq) enabled by default for presets that support them
aq-mode default changed to 1
new "grain" tune
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6918 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x265')
| -rw-r--r-- | contrib/x265/A00-maxCUSize-idiocy.patch | 12 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/x265/A00-maxCUSize-idiocy.patch b/contrib/x265/A00-maxCUSize-idiocy.patch index 862a1e6f6..a5f718101 100644 --- a/contrib/x265/A00-maxCUSize-idiocy.patch +++ b/contrib/x265/A00-maxCUSize-idiocy.patch @@ -1,15 +1,15 @@ -diff -r d2db9c1ab44b source/common/param.cpp ---- a/source/common/param.cpp Fri Oct 31 13:52:08 2014 -0500 -+++ b/source/common/param.cpp Mon Nov 03 10:28:18 2014 -0800 -@@ -1059,6 +1059,7 @@ +diff -r 32d72a0285e0 source/common/param.cpp +--- a/source/common/param.cpp Tue Feb 10 21:38:22 2015 -0600 ++++ b/source/common/param.cpp Thu Feb 12 09:12:01 2015 -0700 +@@ -1151,6 +1151,7 @@ int x265_set_globals(x265_param *param) { +#if 0 static int once /* = 0 */; - if (ATOMIC_CAS32(&once, 0, 1) == 1) -@@ -1070,6 +1071,7 @@ + if (ATOMIC_INC(&once) > 1) +@@ -1162,6 +1163,7 @@ } } else diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index e2e27b0fa..071f7a600 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -2,7 +2,7 @@ __deps__ := YASM CMAKE $(eval $(call import.MODULE.defs,X265,x265,$(__deps__))) $(eval $(call import.CONTRIB.defs,X265)) -X265.FETCH.url = http://download.handbrake.fr/contrib/x265-8768-5e604833c5aa-1.4.tar.bz2 +X265.FETCH.url = http://download.handbrake.fr/contrib/x265-9329-0d30d2641875-1.5.tar.bz2 X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" |