[vlc-commits] Revert "x264: in crf mode, set stream bitrate to be maxrate, so in muxer we have some idea about bitrate"

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Sep  4 16:43:56 2016 +0300| [8d0e56b8e2abe33a92d340ae8a0bc494b5505425] | committer: Ilkka Ollakka

Revert "x264: in crf mode, set stream bitrate to be maxrate, so in muxer we have some idea about bitrate"

This reverts commit 8eac86677e3f6f131ca935571c63646907db9a28.

It causes issue that if user has defined vbv-maxrate, code would set bitrate to be vbv-maxrate
and after probe-phase it would think that bitrate was requested and changes to ABR mode, instead
of staying in CRF mode.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d0e56b8e2abe33a92d340ae8a0bc494b5505425
---

 modules/codec/x264.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 4eba229..2b77d8a 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1029,8 +1029,6 @@ static int  Open ( vlc_object_t *p_this )
 
     /* max bitrate = average bitrate -> CBR */
     p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
-    if( p_sys->param.rc.i_vbv_max_bitrate && p_sys->param.rc.i_rc_method != X264_RC_ABR )
-        p_enc->fmt_out.i_bitrate = p_sys->param.rc.i_vbv_max_bitrate * 1000;
 
 
     if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )