Commit aa0e6bd7 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* compilation fix to reflect x264's API change in its revision 537 (x264 build 48)

It would be nice if someone with more x264-knowledge could review this.
parent 3f319f89
...@@ -586,9 +586,13 @@ static int Open ( vlc_object_t *p_this ) ...@@ -586,9 +586,13 @@ static int Open ( vlc_object_t *p_this )
/* average bitrate specified by transcode vb */ /* average bitrate specified by transcode vb */
p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000; p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000;
#if X264_BUILD < 48
/* cbr = 1 overrides qp or crf and sets an average bitrate /* cbr = 1 overrides qp or crf and sets an average bitrate
but maxrate = average bitrate is needed for "real" CBR */ but maxrate = average bitrate is needed for "real" CBR */
if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1; if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
#else
if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = X264_RC_ABR;
#endif
var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val ); var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int; if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment