[x264-devel] commit: Fix condition for printing rc=cbr in options SEI ( Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon May 10 22:59:12 2010 -0700| [cb0614356f42f7032cec8c09b439570dbc464e01] | committer: Jason Garrett-Glaser 

Fix condition for printing rc=cbr in options SEI
Also fix crf-max formatting.

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

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

diff --git a/common/common.c b/common/common.c
index 848c6de..ad7cf98 100644
--- a/common/common.c
+++ b/common/common.c
@@ -1237,7 +1237,7 @@ char *x264_param2string( x264_param_t *p, int b_res )
         s += sprintf( s, " rc_lookahead=%d", p->rc.i_lookahead );
 
     s += sprintf( s, " rc=%s mbtree=%d", p->rc.i_rc_method == X264_RC_ABR ?
-                               ( p->rc.b_stat_read ? "2pass" : p->rc.i_vbv_buffer_size == p->rc.i_bitrate ? "cbr" : "abr" )
+                               ( p->rc.b_stat_read ? "2pass" : p->rc.i_vbv_max_bitrate == p->rc.i_bitrate ? "cbr" : "abr" )
                                : p->rc.i_rc_method == X264_RC_CRF ? "crf" : "cqp", p->rc.b_mb_tree );
     if( p->rc.i_rc_method == X264_RC_ABR || p->rc.i_rc_method == X264_RC_CRF )
     {
@@ -1256,7 +1256,7 @@ char *x264_param2string( x264_param_t *p, int b_res )
             s += sprintf( s, " vbv_maxrate=%d vbv_bufsize=%d",
                           p->rc.i_vbv_max_bitrate, p->rc.i_vbv_buffer_size );
             if( p->rc.i_rc_method == X264_RC_CRF )
-                s += sprintf( s, " crf-max=%.1f", p->rc.f_rf_constant_max );
+                s += sprintf( s, " crf_max=%.1f", p->rc.f_rf_constant_max );
         }
     }
     else if( p->rc.i_rc_method == X264_RC_CQP )