x265: bump to version 1.7

Eliminates the need for our cleanup patch.
Various bug fixes and improvements.

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

2 files changed, 1 insertions, 50 deletions

diff --git a/contrib/x265/A01-x265-cleanup-nop.patch b/contrib/x265/A01-x265-cleanup-nop.patch
deleted file mode 100644
index a9d209d77..000000000
--- a/contrib/x265/A01-x265-cleanup-nop.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -30,7 +30,7 @@
- mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
- 
- # X265_BUILD must be incremented each time the public API is changed
--set(X265_BUILD 51)
-+set(X265_BUILD 52)
- configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
-                "${PROJECT_BINARY_DIR}/x265.def")
- configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
-diff --git a/source/common/param.cpp b/source/common/param.cpp
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -1183,7 +1183,7 @@
-     uint32_t maxLog2CUSize = (uint32_t)g_log2Size[param->maxCUSize];
-     uint32_t minLog2CUSize = (uint32_t)g_log2Size[param->minCUSize];
- 
--    if (g_ctuSizeConfigured || ATOMIC_INC(&g_ctuSizeConfigured) > 1)
-+    if (ATOMIC_INC(&g_ctuSizeConfigured) > 1)
-     {
-         if (g_maxCUSize != param->maxCUSize)
-         {
-diff --git a/source/encoder/api.cpp b/source/encoder/api.cpp
---- a/source/encoder/api.cpp
-+++ b/source/encoder/api.cpp
-@@ -177,15 +177,18 @@
-         encoder->printSummary();
-         encoder->destroy();
-         delete encoder;
-+        ATOMIC_DEC(&g_ctuSizeConfigured);
-     }
- }
- 
- extern "C"
- void x265_cleanup(void)
- {
--    BitCost::destroy();
--    CUData::s_partSet[0] = NULL; /* allow CUData to adjust to new CTU size */
--    g_ctuSizeConfigured = 0;
-+    if (!g_ctuSizeConfigured)
-+    {
-+        BitCost::destroy();
-+        CUData::s_partSet[0] = NULL; /* allow CUData to adjust to new CTU size */
-+    }
- }
- 
- extern "C"
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 177333b84..1a9ac1a55 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-9964-cbeb7d8a4880-1.6.tar.bz2
+X265.FETCH.url = http://download.handbrake.fr/contrib/x265_1.7.tar.gz
 
 X265.CONFIGURE.exe         = cmake
 X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)"