[x265] [PATCH] doc: Fix colorprim, transfer, and colormatrix strings in docs

[Pradeep Ramachandran]

# HG changeset patch
# User Pradeep Ramachandran <pradeep at multicorewareinc.com>
# Date 1507532665 -19800
#      Mon Oct 09 12:34:25 2017 +0530
# Node ID 0e168bdeb48b3d57d896d3823e2efb2bf69d4b26
# Parent  10e00e5789c2b34340dd29c7c961010bd5bbc8e1
doc: Fix colorprim, transfer, and colormatrix strings in docs

diff -r 10e00e5789c2 -r 0e168bdeb48b doc/reST/cli.rst
--- a/doc/reST/cli.rst	Mon Oct 09 09:30:52 2017 +0530
+++ b/doc/reST/cli.rst	Mon Oct 09 12:34:25 2017 +0530
@@ -1904,7 +1904,7 @@
 	undefined (not signaled)
 
 	1. bt709
-	2. undef
+	2. unknown
 	3. **reserved**
 	4. bt470m
 	5. bt470bg
@@ -1912,16 +1912,16 @@
 	7. smpte240m
 	8. film
 	9. bt2020
-    10. smpte-st-428
-    11. smpte-rp-431
-    12. smpte-eg-432
+    10. smpte428
+    11. smpte431
+    12. smpte432
 
 .. option:: --transfer <integer|string>
 
 	Specify transfer characteristics. Default undefined (not signaled)
 
 	1. bt709
-	2. undef
+	2. unknown
 	3. **reserved**
 	4. bt470m
 	5. bt470bg
@@ -1935,8 +1935,8 @@
 	13. iec61966-2-1
 	14. bt2020-10
 	15. bt2020-12
-	16. smpte-st-2084
-	17. smpte-st-428
+	16. smpte2084
+	17. smpte428
 	18. arib-std-b67
 
 .. option:: --colormatrix <integer|string>
@@ -1955,9 +1955,9 @@
 	8. YCgCo
 	9. bt2020nc
 	10. bt2020c
-    11. smpte-st-2085
-    12. chroma-nc
-    13. chroma-c
+    11. smpte2085
+    12. chroma-derived-nc
+    13. chroma-derived-c
     14. ictcp
 
 .. option:: --chromaloc <0..5>
diff -r 10e00e5789c2 -r 0e168bdeb48b source/x265cli.h
--- a/source/x265cli.h	Mon Oct 09 09:30:52 2017 +0530
+++ b/source/x265cli.h	Mon Oct 09 12:34:25 2017 +0530
@@ -510,13 +510,13 @@
     H1("   --overscan <string>           Specify whether it is appropriate for decoder to show cropped region: undef, show or crop. Default undef\n");
     H0("   --videoformat <string>        Specify video format from undef, component, pal, ntsc, secam, mac. Default undef\n");
     H0("   --range <string>              Specify black level and range of luma and chroma signals as full or limited Default limited\n");
-    H0("   --colorprim <string>          Specify color primaries from undef, bt709, bt470m, bt470bg, smpte170m,\n");
-    H0("                                 smpte240m, film, bt2020, smpte-st-428, smpte-rp-431, smpte-eg-432. Default undef\n");
-    H0("   --transfer <string>           Specify transfer characteristics from undef, bt709, bt470m, bt470bg, smpte170m,\n");
+    H0("   --colorprim <string>          Specify color primaries from  bt709, unknown, reserved, bt470m, bt470bg, smpte170m,\n");
+    H0("                                 smpte240m, film, bt2020, smpte428, smpte431, smpte432. Default undef\n");
+    H0("   --transfer <string>           Specify transfer characteristics from bt709, unknown, reserved, 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, arib-std-b67. Default undef\n");
+    H0("                                 bt2020-10, bt2020-12, smpte2084, smpte428, 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, smpte-st-2085, chroma-nc, chroma-c, ictcp. Default undef\n");
+    H1("                                 smpte240m, GBR, YCgCo, bt2020nc, bt2020c, smpte2085, chroma-derived-nc, chroma-derived-c, ictcp. Default undef\n");
     H1("   --chromaloc <integer>         Specify chroma sample location (0 to 5). Default of %d\n", param->vui.chromaSampleLocTypeTopField);
     H0("   --master-display <string>     SMPTE ST 2086 master display color volume info SEI (HDR)\n");
     H0("                                    format: G(x,y)B(x,y)R(x,y)WP(x,y)L(max,min)\n");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: x265.patch
Type: text/x-patch
Size: 3913 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20171009/16b68c41/attachment-0001.bin>