Commit b7fa2857 authored by Fiona Glaser's avatar Fiona Glaser

Don't do sum/ssd analysis if weightp == 1

Typo fixes in comments and help.
parent f30aed6d
......@@ -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 );
}
......
......@@ -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"
......
......@@ -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 */
......
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