[x265] [PATCH 2 of 3 STABLE] main12: remove scary experimental warnings

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1439959617 -19800
#      Wed Aug 19 10:16:57 2015 +0530
# Branch stable
# Node ID 3aaa90ece0f9047813c9b3748079a29ab35997c8
# Parent  d24c033d6fe5b43a967ea15581ee43187eb3b23a
main12: remove scary experimental warnings

diff -r d24c033d6fe5 -r 3aaa90ece0f9 doc/reST/cli.rst
--- a/doc/reST/cli.rst	Wed Aug 19 09:52:38 2015 +0530
+++ b/doc/reST/cli.rst	Wed Aug 19 10:16:57 2015 +0530
@@ -436,8 +436,8 @@
 	depth of the encoder. If the requested bit depth is not the bit
 	depth of the linked libx265, it will attempt to bind libx265_main
 	for an 8bit encoder, libx265_main10 for a 10bit encoder, or
-	libx265_main12 for a 12bit encoder (EXPERIMENTAL), with the
-	same API version as the linked libx265.
+	libx265_main12 for a 12bit encoder, with the same API version as the
+	linked libx265.
 
 	If the output depth is not specified but :option:`--profile` is
 	specified, the output depth will be derived from the profile name.
@@ -490,13 +490,6 @@
 	The CLI application will derive the output bit depth from the
 	profile name if :option:`--output-depth` is not specified.
 
-.. note::
-
-	All 12bit presets are extremely unstable, do not use them yet.
-	16bit is not supported at all, but those profiles are included
-	because it is possible for libx265 to make bitstreams compatible
-	with them.
-
 .. option:: --level-idc <integer|float>
 
 	Minimum decoder requirement level. Defaults to 0, which implies
diff -r d24c033d6fe5 -r 3aaa90ece0f9 source/encoder/api.cpp
--- a/source/encoder/api.cpp	Wed Aug 19 09:52:38 2015 +0530
+++ b/source/encoder/api.cpp	Wed Aug 19 10:16:57 2015 +0530
@@ -72,9 +72,7 @@
 #endif
 
 #if HIGH_BIT_DEPTH
-    if (X265_DEPTH == 12)
-        x265_log(p, X265_LOG_WARNING, "Main12 is HIGHLY experimental, do not use!\n");
-    else if (X265_DEPTH != 10 && X265_DEPTH != 12)
+    if (X265_DEPTH != 10 && X265_DEPTH != 12)
 #else
     if (X265_DEPTH != 8)
 #endif
diff -r d24c033d6fe5 -r 3aaa90ece0f9 source/x265.h
--- a/source/x265.h	Wed Aug 19 09:52:38 2015 +0530
+++ b/source/x265.h	Wed Aug 19 10:16:57 2015 +0530
@@ -1211,7 +1211,7 @@
     "main422-10", "main422-10-intra",
     "main444-10", "main444-10-intra",
 
-    "main12",     "main12-intra",                  /* Highly Experimental */
+    "main12",     "main12-intra",
     "main422-12", "main422-12-intra",
     "main444-12", "main444-12-intra",