Bump libx265 to version 0.8.

Miscellaneous fixes and improvements, and simplify
the patch to fix multiple inclusions of x265.h


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6114 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 13 insertions, 45 deletions

diff --git a/contrib/x265/A00-x265encoder.patch b/contrib/x265/A00-x265encoder.patch
deleted file mode 100644
index d398e4c1d..000000000
--- a/contrib/x265/A00-x265encoder.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Ncr x265-old/source/common/common.h x265-new/source/common/common.h
-*** x265-old/source/common/common.h	Wed Jan 15 09:08:21 2014
---- x265-new/source/common/common.h	Thu Jan 23 15:16:39 2014
-***************
-*** 27,32 ****
---- 27,42 ----
-  #include <cstdlib>
-  #include "x265.h"
-  
-+ const x265_cli_csp x265_cli_csps[] =
-+ {
-+     { 1, { 0, 0, 0 }, { 0, 0, 0 } }, /* i400 */
-+     { 3, { 0, 1, 1 }, { 0, 1, 1 } }, /* i420 */
-+     { 3, { 0, 1, 1 }, { 0, 0, 0 } }, /* i422 */
-+     { 3, { 0, 0, 0 }, { 0, 0, 0 } }, /* i444 */
-+     { 2, { 0, 0 },    { 0, 1 } },    /* nv12 */
-+     { 2, { 0, 0 },    { 0, 0 } },    /* nv16 */
-+ };
-+ 
-  #define X265_MIN(a, b) ((a) < (b) ? (a) : (b))
-  #define X265_MAX(a, b) ((a) > (b) ? (a) : (b))
-  #define COPY1_IF_LT(x, y) if ((y) < (x)) (x) = (y);
-diff -Ncr x265-old/source/x265.h x265-new/source/x265.h
-*** x265-old/source/x265.h	Wed Jan 15 09:08:21 2014
---- x265-new/source/x265.h	Thu Jan 23 15:16:23 2014
-***************
-*** 195,210 ****
-      int height[3];
-  } x265_cli_csp;
-  
-- const x265_cli_csp x265_cli_csps[] =
-- {
--     { 1, { 0, 0, 0 }, { 0, 0, 0 } }, /* i400 */
--     { 3, { 0, 1, 1 }, { 0, 1, 1 } }, /* i420 */
--     { 3, { 0, 1, 1 }, { 0, 0, 0 } }, /* i422 */
--     { 3, { 0, 0, 0 }, { 0, 0, 0 } }, /* i444 */
--     { 2, { 0, 0 },    { 0, 1 } },    /* nv12 */
--     { 2, { 0, 0 },    { 0, 0 } },    /* nv16 */
-- };
-- 
-  /* rate tolerance method */
-  typedef enum
-  {
---- 195,200 ----
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 0d74842b4..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-6321-8a84c10e5116.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)"