diff options
| author | Rodeo <[email protected]> | 2014-04-06 17:10:57 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-04-06 17:10:57 +0000 |
| commit | 6fd2143293a671266ced4771d42ec99493ca9ffc (patch) | |
| tree | 996ba3466e0ed2a4b1d92d769c20a63eb567573c /contrib/x265 | |
| parent | b607e66d8424880d266eb9fb382f0f8c2fcab89e (diff) | |
Fix previous commit again. This is not my day.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6155 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x265')
| -rw-r--r-- | contrib/x265/A01-x265-multiple-inclusion.patch | 12 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/contrib/x265/A01-x265-multiple-inclusion.patch b/contrib/x265/A01-x265-multiple-inclusion.patch new file mode 100644 index 000000000..b88a7e0ee --- /dev/null +++ b/contrib/x265/A01-x265-multiple-inclusion.patch @@ -0,0 +1,12 @@ +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 1606c9629..e744549a8 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-6657-82bbd2bf3b49-0.9.tar.bz2 +X265.FETCH.url = http://download.handbrake.fr/contrib/x265-6356-527d03c56d68-0.8.tar.bz2 X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" |