[x264-devel] commit: Fix implicit CBR message to only print when in ABR mode ( Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Wed Jan 27 19:41:27 2010 -0800| [38cfabe33e17940870099fcf5d60daae080a3880] | committer: Jason Garrett-Glaser 

Fix implicit CBR message to only print when in ABR mode
Also make it print outside of debug mode.

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

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

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 746b17a..5304616 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -436,8 +436,16 @@ int x264_ratecontrol_new( x264_t *h )
         }
         else if( h->param.rc.i_vbv_max_bitrate == 0 )
         {
-            x264_log( h, X264_LOG_DEBUG, "VBV maxrate unspecified, assuming CBR\n" );
-            h->param.rc.i_vbv_max_bitrate = h->param.rc.i_bitrate;
+            if( h->param.rc.i_rc_method == X264_RC_ABR )
+            {
+                x264_log( h, X264_LOG_INFO, "VBV maxrate unspecified, assuming CBR\n" );
+                h->param.rc.i_vbv_max_bitrate = h->param.rc.i_bitrate;
+            }
+            else
+            {
+                x264_log( h, X264_LOG_INFO, "VBV bufsize set but maxrate unspecified, ignored\n" );
+                h->param.rc.i_vbv_buffer_size = 0;
+            }
         }
     }
     if( h->param.rc.i_vbv_max_bitrate < h->param.rc.i_bitrate &&