Commit 197a94a8 authored by Loren Merritt's avatar Loren Merritt

cosmetics


git-svn-id: svn://svn.videolan.org/x264/trunk@592 df754926-b1dd-0310-bc7b-ec298dee348c
parent 93b54ce1
......@@ -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])
......
......@@ -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"
/*****************************************************************************
* slicetype_decision.c: h264 encoder library
* slicetype.c: h264 encoder library
*****************************************************************************
* Copyright (C) 2005 Loren Merritt
*
......
......@@ -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 );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment