x264.c: set vbv max bitrate to bitrate if doing cbr

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 4b4c1b13f9a8c82ca9260d7550f582c1e7e9a83f..937699806abd3aad4c22662f502271a91f8dbb3a 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -872,7 +872,12 @@ static int  Open ( vlc_object_t *p_this )
 
     /* max bitrate = average bitrate -> CBR */
     var_Get( p_enc, SOUT_CFG_PREFIX "vbv-maxrate", &val );
-    p_sys->param.rc.i_vbv_max_bitrate = val.i_int;
+#if X264_BUILD >= 48
+    if( !val.i_int && p_sys->param.rc.i_rc_method == X264_RC_ABR )
+        p_sys->param.rc.i_vbv_max_bitrate = p_sys->param.rc.i_bitrate;
+    else
+#endif
+        p_sys->param.rc.i_vbv_max_bitrate = val.i_int;
 
 #else
     p_sys->param.rc.i_rc_buffer_size = p_sys->param.rc.i_bitrate;