Fix fastfirstpass

Apparently the libx264 preset changes made "fastfirstpass" into "fastsecondpass" inadvertantly.

diff --git a/common/common.c b/common/common.c
index 51d89294dd6860d6633dc3f9628a8e8337353fa2..923b4e994dd885a683439e631534149ea8033f0f 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -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;

diff --git a/x264.c b/x264.c
index 66f505c10180d394a4b80a6b24b18a59a2ac3cd4..aabb78bf36388dfda6b64f36524ca50aa70477d0 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -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;
 

diff --git a/x264.h b/x264.h
index 7474a50ce45b49f2b4ffc02c680a337c20439771..ccae5e6a340b7a394fad5d2e940b9495622f04b0 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -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 * );