cosmetics

git-svn-id: svn://svn.videolan.org/x264/trunk@592 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/pixel.c b/common/pixel.c
index 6477e974670226da94f39585d7c6b6d2e6d1fe90..365266a08497c453c15d781be91c6a648c588894 100644 (file)
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -292,6 +292,9 @@ PIXEL_SA8D_C( 16, 8 )
 PIXEL_SA8D_C( 8, 16 )
 PIXEL_SA8D_C( 8, 8 )
 
+/****************************************************************************
+ * pixel_sad_x4
+ ****************************************************************************/
 #define SAD_X( size ) \
 static void x264_pixel_sad_x3_##size( uint8_t *fenc, uint8_t *pix0, uint8_t *pix1, uint8_t *pix2, int i_stride, int scores[3] )\
 {\
@@ -322,6 +325,9 @@ SAD_X( 8x16_vis )
 SAD_X( 8x8_vis )
 #endif
 
+/****************************************************************************
+ * structural similarity metric
+ ****************************************************************************/
 static void ssim_4x4x2_core( const uint8_t *pix1, int stride1,
                              const uint8_t *pix2, int stride2,
                              int sums[2][4])

diff --git a/encoder/analyse.c b/encoder/analyse.c
index c3d3c26160e91c829870dcf10922667937440ce9..fcf3a66d51a80ebdb2d855fadbc31d88b1ec756c 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -2619,5 +2619,5 @@ static void x264_analyse_update_cache( x264_t *h, x264_mb_analysis_t *a  )
     }
 }
 
-#include "slicetype_decision.c"
+#include "slicetype.c"
 

diff --git a/encoder/slicetype_decision.c b/encoder/slicetype.c
similarity index 99%
rename from encoder/slicetype_decision.c
rename to encoder/slicetype.c
index e3411b5e4a4cc724fc26b70e3d174d3229588e62..dd1c577021a4d0af682cceeedfb6534d6e7aa928 100644 (file)
--- a/encoder/slicetype_decision.c
+++ b/encoder/slicetype.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * slicetype_decision.c: h264 encoder library
+ * slicetype.c: h264 encoder library
  *****************************************************************************
  * Copyright (C) 2005 Loren Merritt
  *

diff --git a/x264.c b/x264.c
index 6168a3e52fbe615f1171c58274a3c3969ba1b7f2..74d5e2645a01b5d696aac1b79aac1f9fe82f57d9 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -171,7 +171,7 @@ static void Help( x264_param_t *defaults, int b_longhelp )
     H0( "\n" );
     H0( "  -q, --qp <integer>          Set QP (0=lossless) [%d]\n", defaults->rc.i_qp_constant );
     H0( "  -B, --bitrate <integer>     Set bitrate (kbit/s)\n" );
-    H0( "      --crf <integer>         Quality-based VBR (nominal QP)\n" );
+    H0( "      --crf <float>           Quality-based VBR (nominal QP)\n" );
     H1( "      --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate );
     H0( "      --vbv-bufsize <integer> Enable CBR and set size of the VBV buffer (kbit) [%d]\n", defaults->rc.i_vbv_buffer_size );
     H1( "      --vbv-init <float>      Initial VBV buffer occupancy [%.1f]\n", defaults->rc.f_vbv_buffer_init );