Commit 714692cc authored by Fiona Glaser's avatar Fiona Glaser

Fix fastfirstpass

Apparently the libx264 preset changes made "fastfirstpass" into "fastsecondpass" inadvertantly.
parent 7fbc84b8
......@@ -374,7 +374,7 @@ int x264_param_default_preset( x264_param_t *param, const char *preset, const ch
void x264_param_apply_fastfirstpass( x264_param_t *param )
{
/* Set faster options in case of turbo firstpass. */
if( param->rc.b_stat_read && !param->rc.b_stat_write )
if( param->rc.b_stat_write && !param->rc.b_stat_read )
{
param->i_frame_reference = 1;
param->analyse.b_transform_8x8 = 0;
......
......@@ -818,17 +818,16 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
if( c == -1 )
break;
if( c == OPT_PRESET )
{
preset = optarg;
if( !strcmp( preset, "placebo" ) )
b_turbo = 0;
}
if( c == OPT_TUNE )
tune = optarg;
else if( c == '?' )
return -1;
}
if( preset && !strcmp( preset, "placebo" ) )
b_turbo = 0;
if( x264_param_default_preset( param, preset, tune ) < 0 )
return -1;
......
......@@ -413,7 +413,7 @@ static const char * const x264_tune_names[] = { "film", "animation", "grain", "p
int x264_param_default_preset( x264_param_t *, const char *preset, const char *tune );
/* x264_param_apply_fastfirstpass:
* If first-pass mode is set (rc.b_stat_read == 1, rc.b_stat_write == 0),
* If first-pass mode is set (rc.b_stat_read == 0, rc.b_stat_write == 1),
* modify the encoder settings to disable options generally not useful on
* the first pass. */
void x264_param_apply_fastfirstpass( x264_param_t * );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment