sync to x264 r591

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 127ea6e96c7df93c20aa2245d26cf930c292cb46..4777700bf95b24437fff522436d9ec93b397024d 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -916,7 +916,11 @@ static int  Open ( vlc_object_t *p_this )
     var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val ); 
     if( val.i_int > 0 && val.i_int <= 51 )
     {
+#if X264_BUILD >= 54
+        p_sys->param.rc.f_rf_constant = val.i_int;
+#else
         p_sys->param.rc.i_rf_constant = val.i_int;
+#endif
 #if X264_BUILD >= 48
         p_sys->param.rc.i_rc_method = X264_RC_CRF;
 #endif