Commit 609deaf5 authored by Loren Merritt's avatar Loren Merritt

typo in expand_border_mod16



git-svn-id: svn://svn.videolan.org/x264/trunk@517 df754926-b1dd-0310-bc7b-ec298dee348c
parent f5bdc828
......@@ -254,7 +254,7 @@ void x264_frame_expand_border_mod16( x264_t *h, x264_frame_t *frame )
}
if( i_pady )
{
for( y = i_height; y < i_height + i_pady; y++ );
for( y = i_height; y < i_height + i_pady; y++ )
memcpy( &frame->plane[i][y*frame->i_stride[i]],
&frame->plane[i][(i_height-1)*frame->i_stride[i]],
i_width + i_padx );
......
......@@ -1370,14 +1370,14 @@ static int init_pass2( x264_t *h )
if(weight < .0001)
break;
weight_sum += weight;
cplx_sum += weight * (qscale2bits(rcj, 1) - rcc->entry[j].misc_bits);
cplx_sum += weight * (qscale2bits(rcj, 1) - rcj->misc_bits);
}
/* weighted average of cplx of past frames */
weight = 1.0;
for(j=0; j<=cplxblur*2 && j<=i; j++){
ratecontrol_entry_t *rcj = &rcc->entry[i-j];
weight_sum += weight;
cplx_sum += weight * (qscale2bits(rcj, 1) - rcc->entry[j].misc_bits);
cplx_sum += weight * (qscale2bits(rcj, 1) - rcj->misc_bits);
weight *= 1 - pow( (float)rcj->i_count / rcc->nmb, 2 );
if(weight < .0001)
break;
......
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