Enable --fast-pskip on fast firstpass

diff --git a/common/common.c b/common/common.c
index d6c299137d4ee85f5ade1c6a3548a043cd375941..924323a07878e5eef93d969774026f9b09cf2c92 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -405,6 +405,7 @@ void x264_param_apply_fastfirstpass( x264_param_t *param )
         param->analyse.i_me_method = X264_ME_DIA;
         param->analyse.i_subpel_refine = X264_MIN( 2, param->analyse.i_subpel_refine );
         param->analyse.i_trellis = 0;
+        param->analyse.b_fast_pskip = 1;
     }
 }
 

diff --git a/x264.c b/x264.c
index add23b3bb61e380e13a4de6ef3b8cd7310d28fbe..3f46fd93ac96be5995468020984103f2f33d8a2e 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -356,8 +356,9 @@ static void Help( x264_param_t *defaults, int longhelp )
              "                                                 stillimage,psnr,ssim\n"
              "                                  - other tunings: fastdecode,zerolatency\n" );
     H2( "      --slow-firstpass        Don't force these faster settings with --pass 1:\n"
-        "                                  --no-8x8dct --me dia --partitions none --ref 1\n"
-        "                                  --subme {2 if >2 else unchanged} --trellis 0\n" );
+        "                                  --no-8x8dct --me dia --partitions none\n"
+        "                                  --ref 1 --subme {2 if >2 else unchanged}\n"
+        "                                  --trellis 0 --fast-pskip\n" );
     else H1( "      --slow-firstpass        Don't force faster settings with --pass 1\n" );
     H0( "\n" );
     H0( "Frame-type options:\n" );