[x265] [PATCH 5 of 8] cmake: change multilib namespaces to x265_8bit/x265_10bit

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1435023306 18000
#      Mon Jun 22 20:35:06 2015 -0500
# Node ID 25390edc448aef5ff1732bb077d080f2d254e0d2
# Parent  0b36c393bb3a2ddaacad0c05dafd78aa3ca44682
cmake: change multilib namespaces to x265_8bit/x265_10bit

diff -r 0b36c393bb3a -r 25390edc448a source/CMakeLists.txt
--- a/source/CMakeLists.txt	Mon Jun 22 20:32:39 2015 -0500
+++ b/source/CMakeLists.txt	Mon Jun 22 20:35:06 2015 -0500
@@ -298,10 +298,10 @@
     set(X265_NS x265)
     add_definitions(-DEXPORT_C_API=1)
 elseif(HIGH_BIT_DEPTH)
-    set(X265_NS x265_10bpp)
+    set(X265_NS x265_10bit)
     add_definitions(-DEXPORT_C_API=0)
 else()
-    set(X265_NS x265_8bpp)
+    set(X265_NS x265_8bit)
     add_definitions(-DEXPORT_C_API=0)
 endif()
 add_definitions(-DX265_NS=${X265_NS})
diff -r 0b36c393bb3a -r 25390edc448a source/encoder/api.cpp
--- a/source/encoder/api.cpp	Mon Jun 22 20:32:39 2015 -0500
+++ b/source/encoder/api.cpp	Mon Jun 22 20:35:06 2015 -0500
@@ -420,7 +420,7 @@
 /* multilib namespace reflectors */
 #if X265_DEPTH == 8 && !EXPORT_C_API
 
-namespace x265_10bpp {
+namespace x265_10bit {
 const x265_api* x265_api_get(int bitDepth);
 const x265_api* x265_api_query(int bitDepth, int apiVersion, int* err);
 }
@@ -429,9 +429,9 @@
 const x265_api* x265_api_get(int bitDepth)
 {
     if (!bitDepth || bitDepth == 8)
-        return x265_8bpp::x265_api_get(0);
+        return x265_8bit::x265_api_get(0);
     else if (bitDepth == 10)
-        return x265_10bpp::x265_api_get(0);
+        return x265_10bit::x265_api_get(0);
     return NULL;
 }
 
@@ -439,9 +439,9 @@
 const x265_api* x265_api_query(int bitDepth, int apiVersion, int* err)
 {
     if (!bitDepth || bitDepth == 8)
-        return x265_8bpp::x265_api_query(0, apiVersion, err);
+        return x265_8bit::x265_api_query(0, apiVersion, err);
     else if (bitDepth == 10)
-        return x265_10bpp::x265_api_query(0, apiVersion, err);
+        return x265_10bit::x265_api_query(0, apiVersion, err);
     return NULL;
 }
 #endif