Commit d1df0c41 authored by Fiona Glaser's avatar Fiona Glaser

Fix a typo in b-pyramid help

And an errant space in common/macroblock.c
parent 62ff2d43
......@@ -33,7 +33,7 @@ void x264_mb_predict_mv( x264_t *h, int i_list, int idx, int i_width, int16_t mv
int16_t *mv_a = h->mb.cache.mv[i_list][i8 - 1];
int i_refb = h->mb.cache.ref[i_list][i8 - 8];
int16_t *mv_b = h->mb.cache.mv[i_list][i8 - 8];
int i_refc = h->mb.cache.ref[i_list][i8 - 8 + i_width ];
int i_refc = h->mb.cache.ref[i_list][i8 - 8 + i_width];
int16_t *mv_c = h->mb.cache.mv[i_list][i8 - 8 + i_width];
int i_count = 0;
......
......@@ -200,7 +200,7 @@ static void Help( x264_param_t *defaults, int longhelp )
H2( " --b-bias <integer> Influences how often B-frames are used [%d]\n", defaults->i_bframe_bias );
H1( " --b-pyramid <string> Keep some B-frames as references [%s]\n"
" - none: Disabled\n"
" - strict: Strictly heirarchical pyramid\n"
" - strict: Strictly hierarchical pyramid\n"
" - normal: Non-strict (not Blu-ray compatible)\n",
strtable_lookup( x264_b_pyramid_names, defaults->i_bframe_pyramid ) );
H1( " --no-cabac Disable CABAC\n" );
......
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