summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-08-08 20:24:30 +0000
committerjstebbins <[email protected]>2011-08-08 20:24:30 +0000
commit8f930a4ecbf1bbb3f658fae5bdeb7c272ff4250e (patch)
treec1cbcd43e43f8e18d5c0db89e5ae51eb3d02b04e /test
parent1a10eb0fcb770aa7eab1a08e0ebd03646bb6bfdc (diff)
libhb: allow changing colorimetry in x264 options
Setting "colorprim", "transfer", or "colormarix" in the x264 advanced options will no longer be ignored and will propagate to the mp4 muxer where those values also get set in the container. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4164 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
-rw-r--r--test/test.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test.c b/test/test.c
index 4fd728537..55144dd3a 100644
--- a/test/test.c
+++ b/test/test.c
@@ -123,7 +123,7 @@ static char * preset_name = 0;
static int cfr = 0;
static int mp4_optimize = 0;
static int ipod_atom = 0;
-static int color_matrix = 0;
+static int color_matrix_code = 0;
static int preview_count = 10;
static int store_previews = 0;
static int start_at_preview = 0;
@@ -2229,9 +2229,9 @@ static int HandleEvents( hb_handle_t * h )
job->file = strdup( output );
- if( color_matrix )
+ if( color_matrix_code )
{
- job->color_matrix = color_matrix;
+ job->color_matrix_code = color_matrix_code;
}
if( advanced_opts != NULL && *advanced_opts != '\0' )
@@ -3461,9 +3461,9 @@ static int ParseOptions( int argc, char ** argv )
break;
case 'M':
if( atoi( optarg ) == 601 )
- color_matrix = 1;
+ color_matrix_code = 1;
else if( atoi( optarg ) == 709 )
- color_matrix = 2;
+ color_matrix_code = 2;
break;
case MIN_DURATION:
min_title_duration = strtol( optarg, NULL, 0 );