[x264-devel] [PATCH] iec61966-2-* to xvycc / srgb (was Add bt.2020 colorspace and other new H.264 VUI info)

[Joshua Bowman]

On 6/5/2014 5:55 PM, Joshua Bowman wrote:
> Patch is attached. Information is from H.264 04/2013 standard update on ITU site.
Ignore that patch, I see I was using a git mirror that was WAY out of date. The only change I'd
like to make now then is changing iec61966-2-* to xvycc and srgb, then, as those are the
well-known names for those standards.
-------------- next part --------------
 x264.c | 3 +--
 x264.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/x264.c b/x264.c
index f1c758a..7b7b9db 100644
--- a/x264.c
+++ b/x264.c
@@ -838,8 +838,7 @@ static void help( x264_param_t *defaults, int longhelp )
     H2( "      --transfer <string>     Specify transfer characteristics [\"%s\"]\n"
         "                                  - undef, bt709, bt470m, bt470bg, smpte170m,\n"
         "                                    smpte240m, linear, log100, log316,\n"
-        "                                    iec61966-2-4, bt1361e, iec61966-2-1,\n"
-        "                                    bt2020-10, bt2020-12\n",
+        "                                    xvycc, bt1361e, srgb, bt2020-10, bt2020-12\n",
                                        strtable_lookup( x264_transfer_names, defaults->vui.i_transfer ) );
     H2( "      --colormatrix <string>  Specify color matrix setting [\"%s\"]\n"
         "                                  - undef, bt709, fcc, bt470bg, smpte170m,\n"
diff --git a/x264.h b/x264.h
index b94e4a9..18f4030 100644
--- a/x264.h
+++ b/x264.h
@@ -202,7 +202,7 @@ static const char * const x264_vidformat_names[] = { "component", "pal", "ntsc",
 static const char * const x264_fullrange_names[] = { "off", "on", 0 };
 static const char * const x264_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", 0 };
 static const char * const x264_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316",
-                                                    "iec61966-2-4", "bt1361e", "iec61966-2-1", "bt2020-10", "bt2020-12", 0 };
+                                                    "xvycc", "bt1361e", "srgb", "bt2020-10", "bt2020-12", 0 };
 static const char * const x264_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", "bt2020nc", "bt2020c", 0 };
 static const char * const x264_nal_hrd_names[] = { "none", "vbr", "cbr", 0 };