[x265] [PATCH] vui: tweak the string name of ARIB STD-B67, to avoid possible future conflicts

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1438631781 18000
#      Mon Aug 03 14:56:21 2015 -0500
# Node ID 1f161d9c6e35e32998d38ebf5b6dec96f1ef43e2
# Parent  d5278c76d341b3bac405938dbfb64cb7e2d9bce5
vui: tweak the string name of ARIB STD-B67, to avoid possible future conflicts

diff -r d5278c76d341 -r 1f161d9c6e35 doc/reST/cli.rst
--- a/doc/reST/cli.rst	Mon Aug 03 10:18:46 2015 -0500
+++ b/doc/reST/cli.rst	Mon Aug 03 14:56:21 2015 -0500
@@ -1583,7 +1583,7 @@
 	15. bt2020-12
 	16. smpte-st-2084
 	17. smpte-st-428
-	18. std-b67
+	18. arib-std-b67
 
 .. option:: --colormatrix <integer|string>
 
diff -r d5278c76d341 -r 1f161d9c6e35 source/common/param.cpp
--- a/source/common/param.cpp	Mon Aug 03 10:18:46 2015 -0500
+++ b/source/common/param.cpp	Mon Aug 03 14:56:21 2015 -0500
@@ -1118,7 +1118,7 @@
           || param->vui.transferCharacteristics == 3,
           "Transfer Characteristics must be undef, bt709, bt470m, bt470bg,"
           " smpte170m, smpte240m, linear, log100, log316, iec61966-2-4, bt1361e,"
-          " iec61966-2-1, bt2020-10, bt2020-12, smpte-st-2084, smpte-st-428 or std-b67");
+          " iec61966-2-1, bt2020-10, bt2020-12, smpte-st-2084, smpte-st-428 or arib-std-b67");
     CHECK(param->vui.matrixCoeffs < 0
           || param->vui.matrixCoeffs > 10
           || param->vui.matrixCoeffs == 3,
diff -r d5278c76d341 -r 1f161d9c6e35 source/x265.h
--- a/source/x265.h	Mon Aug 03 10:18:46 2015 -0500
+++ b/source/x265.h	Mon Aug 03 14:56:21 2015 -0500
@@ -388,7 +388,7 @@
 static const char * const x265_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", 0 };
 static const char * const x265_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100",
                                                     "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12",
-                                                    "smpte-st-2084", "smpte-st-428", "std-b67", 0 };
+                                                    "smpte-st-2084", "smpte-st-428", "arib-std-b67", 0 };
 static const char * const x265_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m",
                                                      "YCgCo", "bt2020nc", "bt2020c", 0 };
 static const char * const x265_sar_names[] = { "undef", "1:1", "12:11", "10:11", "16:11", "40:33", "24:11", "20:11",
diff -r d5278c76d341 -r 1f161d9c6e35 source/x265cli.h
--- a/source/x265cli.h	Mon Aug 03 10:18:46 2015 -0500
+++ b/source/x265cli.h	Mon Aug 03 14:56:21 2015 -0500
@@ -396,7 +396,7 @@
     H0("                                 smpte240m, film, bt2020. Default undef\n");
     H0("   --transfer <string>           Specify transfer characteristics from undef, bt709, bt470m, bt470bg, smpte170m,\n");
     H0("                                 smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1,\n");
-    H0("                                 bt2020-10, bt2020-12, smpte-st-2084, smpte-st-428, std-b67. Default undef\n");
+    H0("                                 bt2020-10, bt2020-12, smpte-st-2084, smpte-st-428, arib-std-b67. Default undef\n");
     H1("   --colormatrix <string>        Specify color matrix setting from undef, bt709, fcc, bt470bg, smpte170m,\n");
     H1("                                 smpte240m, GBR, YCgCo, bt2020nc, bt2020c. Default undef\n");
     H1("   --chromaloc <integer>         Specify chroma sample location (0 to 5). Default of %d\n", param->vui.chromaSampleLocTypeTopField);