From: Fiona Glaser <fiona@x264.com>
Date: Tue, 13 Oct 2009 01:40:28 +0000 (-0700)
Subject: Fix glitches with slow-firstpass + weightb + multiref + 2pass
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=744ea94e0d76db75eb111f1e8c9f4804165a6315;p=libx264

Fix glitches with slow-firstpass + weightb + multiref + 2pass
Bug in r1277
---

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 47443033..119b1365 100644
--- 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 );