[x264-devel] commit: Remove unused function (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Tue Feb 23 13:52:15 2010 -0800| [e29c75837c72a0ed387441ffa6bab339dbe3de9f] | committer: Jason Garrett-Glaser 

Remove unused function
Two other minor fixes.

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

 encoder/macroblock.c |   12 ------------
 x264.c               |    8 ++++----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index 0be6201..c9549ba 100644
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -78,18 +78,6 @@ static inline void dct2x2dc( int16_t d[4], int16_t dct4x4[4][16] )
     dct4x4[3][0] = 0;
 }
 
-static inline void dct2x2dc_dconly( int16_t d[4] )
-{
-    int d0 = d[0] + d[1];
-    int d1 = d[2] + d[3];
-    int d2 = d[0] - d[1];
-    int d3 = d[2] - d[3];
-    d[0] = d0 + d1;
-    d[2] = d2 + d3;
-    d[1] = d0 - d1;
-    d[3] = d2 - d3;
-}
-
 static ALWAYS_INLINE int x264_quant_4x4( x264_t *h, int16_t dct[16], int i_qp, int i_ctxBlockCat, int b_intra, int idx )
 {
     int i_quant_cat = b_intra ? CQM_4IY : CQM_4PY;
diff --git a/x264.c b/x264.c
index aabb78b..e805042 100644
--- a/x264.c
+++ b/x264.c
@@ -389,9 +389,9 @@ static void Help( x264_param_t *defaults, int longhelp )
                                        strtable_lookup( x264_direct_pred_names, defaults->analyse.i_direct_mv_pred ) );
     H2( "      --no-weightb            Disable weighted prediction for B-frames\n" );
     H1( "      --weightp <integer>     Weighted prediction for P-frames [%d]\n"
-        "                              - 0: Disabled\n"
-        "                              - 1: Blind offset\n"
-        "                              - 2: Smart analysis\n", defaults->analyse.i_weighted_pred );
+        "                                  - 0: Disabled\n"
+        "                                  - 1: Blind offset\n"
+        "                                  - 2: Smart analysis\n", defaults->analyse.i_weighted_pred );
     H1( "      --me <string>           Integer pixel motion estimation method [\"%s\"]\n",
                                        strtable_lookup( x264_motion_est_names, defaults->analyse.i_me_method ) );
     H2( "                                  - dia: diamond search, radius 1 (fast)\n"
@@ -825,7 +825,7 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
             return -1;
     }
 
-    if( preset && !strcmp( preset, "placebo" ) )
+    if( preset && !strcasecmp( preset, "placebo" ) )
         b_turbo = 0;
 
     if( x264_param_default_preset( param, preset, tune ) < 0 )