typo in expand_border_mod16

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

diff --git a/common/frame.c b/common/frame.c
index 60762201c3b262a9666cebb52919e19e1c1b3f10..bd0cb7af3cd247bb8d30c8f392e50a5944eca99e 100644 (file)
--- a/common/frame.c
+++ b/common/frame.c
@@ -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 );

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 3dcec1737b98ffc1a4ec7be4a14eaf36174f8a42..5154128164c59e634e3f3aeacaf942f285a7a7e7 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -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;