summaryrefslogtreecommitdiffstats
path: root/libhb/encx264.c
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-03-15 17:35:12 -0600
committerJohn Stebbins <[email protected]>2019-04-08 07:44:09 -0600
commit219b2540dc3ae2bb80f634b7df25f228f3a679ed (patch)
treebd06a7b6945343399c08c35f1539538eb1c2f5e1 /libhb/encx264.c
parentbe581837296bc947df6ffe83dbabde137e92e039 (diff)
libhb: change preset key to VideoColorMatrixCodeOverride
Reserve VideoColorMatrixCode for doing color conversion. VideoColorMatrixCodeOverride sets color flags without transforming video frame colors.
Diffstat (limited to 'libhb/encx264.c')
-rw-r--r--libhb/encx264.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libhb/encx264.c b/libhb/encx264.c
index 16c3e7f16..e4d8deac2 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -389,9 +389,9 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
/* set up the VUI color model & gamma to match what the COLR atom
* set in muxmp4.c says. See libhb/muxmp4.c for notes. */
- param.vui.i_colorprim = job->color_prim;
- param.vui.i_transfer = job->color_transfer;
- param.vui.i_colmatrix = job->color_matrix;
+ param.vui.i_colorprim = hb_output_color_prim(job);
+ param.vui.i_transfer = hb_output_color_transfer(job);
+ param.vui.i_colmatrix = hb_output_color_matrix(job);
/* place job->encoder_options in an hb_dict_t for convenience */
hb_dict_t * x264_opts = NULL;
@@ -425,9 +425,9 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
/* Reload colorimetry settings in case custom values were set
* in the encoder_options string */
- job->color_prim = param.vui.i_colorprim;
- job->color_transfer = param.vui.i_transfer;
- job->color_matrix = param.vui.i_colmatrix;
+ job->color_prim_override = param.vui.i_colorprim;
+ job->color_transfer_override = param.vui.i_transfer;
+ job->color_matrix_override = param.vui.i_colmatrix;
/* For 25 fps sources, HandBrake's explicit keyints will match the x264 defaults:
* min-keyint 25 (same as auto), keyint 250. */