Fix glitches with slow-firstpass + weightb + multiref + 2pass

Bug in r1277

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 474430338c7ac994968e1e66607a6df4570623ab..119b1365f14ee731544e0c1cd31f322be7c939d9 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -1772,9 +1772,6 @@ int     x264_encoder_encode( x264_t *h,
     /* build ref list 0/1 */
     x264_reference_build_list( h, h->fdec->i_poc );
 
-    if( h->sh.i_type == SLICE_TYPE_B )
-        x264_macroblock_bipred_init( h );
-
     /* ---------------------- Write the bitstream -------------------------- */
     /* Init bitstream context */
     h->out.i_nal = 0;
@@ -1858,6 +1855,9 @@ int     x264_encoder_encode( x264_t *h,
             break;
         }
 
+    if( h->sh.i_type == SLICE_TYPE_B )
+        x264_macroblock_bipred_init( h );
+
     /* ------------------------ Create slice header  ----------------------- */
     x264_slice_init( h, i_nal_type, i_global_qp );