[x264-devel] commit: Reduce memory usage in 2-pass with b-adapt 2 (Loren Merritt )

[git at videolan.org]

x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Mon May 17 14:08:37 2010 -0700| [86c8fec9a8fe39b2a6381fe25bb69ec10e3a6859] | committer: Jason Garrett-Glaser 

Reduce memory usage in 2-pass with b-adapt 2

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

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

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 19cb79d..90c15d0 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -928,7 +928,7 @@ x264_t *x264_encoder_open( x264_param_t *param )
     h->mb.i_mb_count = h->sps->i_mb_width * h->sps->i_mb_height;
 
     /* Init frames. */
-    if( h->param.i_bframe_adaptive == X264_B_ADAPT_TRELLIS )
+    if( h->param.i_bframe_adaptive == X264_B_ADAPT_TRELLIS && !h->param.rc.b_stat_read )
         h->frames.i_delay = X264_MAX(h->param.i_bframe,3)*4;
     else
         h->frames.i_delay = h->param.i_bframe;