[x264-devel] commit: Don't do sum/ssd analysis if weightp == 1 (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sun Dec 13 03:16:04 2009 -0800| [3feaec244c11ad4496ac4f6a630200a89db2d308] | committer: Jason Garrett-Glaser 

Don't do sum/ssd analysis if weightp == 1
Typo fixes in comments and help.

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

 encoder/encoder.c |    2 +-
 x264.c            |    2 +-
 x264.h            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 1b1f647..82a5b8e 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2042,7 +2042,7 @@ int     x264_encoder_encode( x264_t *h,
 
         if( h->frames.b_have_lowres )
         {
-            if( h->param.analyse.i_weighted_pred )
+            if( h->param.analyse.i_weighted_pred == X264_WEIGHTP_FAKE || h->param.analyse.i_weighted_pred == X264_WEIGHTP_SMART )
                 x264_weight_plane_analyse( h, fenc );
             x264_frame_init_lowres( h, fenc );
         }
diff --git a/x264.c b/x264.c
index 95c2055..57db499 100644
--- a/x264.c
+++ b/x264.c
@@ -235,7 +235,7 @@ static void Help( x264_param_t *defaults, int longhelp )
         "                                    --ref {Double if >1 else 1}\n"
         "                                  - grain:\n"
         "                                    --aq-strength 0.5 --no-dct-decimate\n"
-        "                                    --deadzone inter 6 --deadzone-intra 6\n"
+        "                                    --deadzone-inter 6 --deadzone-intra 6\n"
         "                                    --deblock -2:-2 --ipratio 1.1 \n"
         "                                    --pbratio 1.1 --psy-rd <unset>:0.25\n"
         "                                    --qcomp 0.8\n"
diff --git a/x264.h b/x264.h
index f1d8202..3a65912 100644
--- a/x264.h
+++ b/x264.h
@@ -204,7 +204,7 @@ typedef struct x264_param_t
     int         i_bframe;   /* how many b-frame between 2 references pictures */
     int         i_bframe_adaptive;
     int         i_bframe_bias;
-    int         i_bframe_pyramid;   /* Keep some B-frames as references: 0=off, 1=strict heirarchical, 2=normal */
+    int         i_bframe_pyramid;   /* Keep some B-frames as references: 0=off, 1=strict hierarchical, 2=normal */
 
     int         b_deblocking_filter;
     int         i_deblocking_filter_alphac0;    /* [-6, 6] -6 light filter, 6 strong */