Fix speed regression in r951

Row SATDs are only necessary in VBV mode, so don't need to be checked if VBV is off.

diff --git a/encoder/slicetype.c b/encoder/slicetype.c
index e68b06edb53c3814036d33884625a7afdb51da95..767e02fff00d0987714fc910082b57609319ec6f 100644 (file)
--- a/encoder/slicetype.c
+++ b/encoder/slicetype.c
@@ -248,7 +248,7 @@ static int x264_slicetype_frame_cost( x264_t *h, x264_mb_analysis_t *a,
      * If we have tried this frame as P, then we have also tried
      * the preceding frames as B. (is this still true?) */
     /* Also check that we already calculated the row SATDs for the current frame. */
-    if( frames[b]->i_cost_est[b-p0][p1-b] >= 0 && frames[b]->i_row_satds[b-p0][p1-b][0] != -1 )
+    if( frames[b]->i_cost_est[b-p0][p1-b] >= 0 && (!h->param.rc.i_vbv_buffer_size || frames[b]->i_row_satds[b-p0][p1-b][0] != -1) )
     {
         i_score = frames[b]->i_cost_est[b-p0][p1-b];
     }