[x264-devel] commit: Fix regression in b-adapt patch: encoder_open failed for multipass encodes without bframes. ( Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon Sep 15 12:22:48 2008 -0700| [f4736691f1052fbe32288a5fd87abce672c7b32f] | committer: Jason Garrett-Glaser 

Fix regression in b-adapt patch: encoder_open failed for multipass encodes without bframes.

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

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

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 0b99e98..3251f4f 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -400,7 +400,7 @@ int x264_ratecontrol_new( x264_t *h )
 
             if( ( p = strstr( opts, "b_adapt=" ) ) && sscanf( p, "b_adapt=%d", &i ) && i >= X264_B_ADAPT_NONE && i <= X264_B_ADAPT_TRELLIS )
                 h->param.i_bframe_adaptive = i;
-            else
+            else if( h->param.i_bframe )
             {
                 x264_log( h, X264_LOG_ERROR, "b_adapt method specified in stats file not valid\n" );
                 return -1;