[x264-devel] commit: Fix glitches with slow-firstpass + weightb + multiref + 2pass ( Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon Oct 12 18:40:28 2009 -0700| [e381f6d0093504a545fe4d90e3a6f178c6877cc7] | committer: Jason Garrett-Glaser 

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

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=e381f6d0093504a545fe4d90e3a6f178c6877cc7
---

 encoder/encoder.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/encoder/encoder.c b/encoder/encoder.c
index c49ed22..24aba6f 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 );