[x264-devel] commit: Don't print a warning about direct= auto in 2pass when B-frames are off (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Sun Aug  9 16:06:52 2009 -0700| [7f8aa6fa1819a62196c1953d85fa6e3d504e39b7] | committer: Jason Garrett-Glaser 

Don't print a warning about direct=auto in 2pass when B-frames are off

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

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

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 6de7346..7b8d2f2 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -478,8 +478,11 @@ static int x264_validate_parameters( x264_t *h )
     h->param.i_bframe_bias = x264_clip3( h->param.i_bframe_bias, -90, 100 );
     h->param.b_bframe_pyramid = h->param.b_bframe_pyramid && h->param.i_bframe > 1;
     if( !h->param.i_bframe )
+    {
         h->param.i_bframe_adaptive = X264_B_ADAPT_NONE;
-    h->param.analyse.b_weighted_bipred = h->param.analyse.b_weighted_bipred && h->param.i_bframe > 0;
+        h->param.analyse.i_direct_mv_pred = 0;
+        h->param.analyse.b_weighted_bipred = 0;
+    }
     h->param.rc.i_lookahead = x264_clip3( h->param.rc.i_lookahead, 0, X264_LOOKAHEAD_MAX );
     h->param.rc.i_lookahead = X264_MIN( h->param.rc.i_lookahead, h->param.i_keyint_max );
     if( h->param.rc.b_stat_read )