[x265-commits] [x265] sei: remaining bits of master-display SEI changes

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/4cf55e54fe3e
branches:  
changeset: 10354:4cf55e54fe3e
user:      Steve Borho <steve at borho.org>
date:      Sat May 02 10:58:05 2015 -0500
description:
sei: remaining bits of master-display SEI changes

these were somehow lost during a rebase operation

diffstat:

 source/encoder/sei.h |  2 +-
 source/x265cli.h     |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 57f8246c759d -r 4cf55e54fe3e source/encoder/sei.h
--- a/source/encoder/sei.h	Wed Apr 29 19:40:08 2015 -0700
+++ b/source/encoder/sei.h	Sat May 02 10:58:05 2015 -0500
@@ -126,7 +126,7 @@ public:
 
     bool parse(const char* value)
     {
-        return sscanf(value, "Y(%hu,%hu)U(%hu,%hu)V(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
+        return sscanf(value, "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
                       &displayPrimaryX[0], &displayPrimaryY[0],
                       &displayPrimaryX[1], &displayPrimaryY[1],
                       &displayPrimaryX[2], &displayPrimaryY[2],
diff -r 57f8246c759d -r 4cf55e54fe3e source/x265cli.h
--- a/source/x265cli.h	Wed Apr 29 19:40:08 2015 -0700
+++ b/source/x265cli.h	Sat May 02 10:58:05 2015 -0500
@@ -393,7 +393,7 @@ static void showHelp(x265_param *param)
     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);
     H0("   --master-display <string>     SMPTE ST 2086 master display color volume info\n");
-    H0("                                    format: Y(x,y)U(x,y)V(x,y)WP(x,y)L(max,min)\n");
+    H0("                                    format: G(x,y)B(x,y)R(x,y)WP(x,y)L(max,min)\n");
     H0("\nBitstream options:\n");
     H0("   --[no-]repeat-headers         Emit SPS and PPS headers at each keyframe. Default %s\n", OPT(param->bRepeatHeaders));
     H0("   --[no-]info                   Emit SEI identifying encoder and parameters. Default %s\n", OPT(param->bEmitInfoSEI));