[x264-devel] commit: Enable --fast-pskip on fast firstpass (Anton Mitrofanov )

[git at videolan.org]

x264 | branch: master | Anton Mitrofanov <BugMaster at narod.ru> | Tue Apr 13 21:25:42 2010 +0400| [dabc4b1e60f00c90f0ab27e76f3657d95b19feb8] | committer: Jason Garrett-Glaser 

Enable --fast-pskip on fast firstpass

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=dabc4b1e60f00c90f0ab27e76f3657d95b19feb8
---

 common/common.c |    1 +
 x264.c          |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/common.c b/common/common.c
index d6c2991..924323a 100644
--- 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 add23b3..3f46fd9 100644
--- 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" );