Fix latest crash in modules/codec/x264.c with ratecontrol.

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 01fcfc573a14489ee556b350c12b811fc27aab32..97ec2108bdc598447e6eb1a0e543dd32f1e7a050 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -782,14 +782,6 @@ static int  Open ( vlc_object_t *p_this )
     /* average bitrate specified by transcode vb */
     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
-       but maxrate = average bitrate is needed for "real" CBR */
-    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 );
     if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
     var_Get( p_enc, SOUT_CFG_PREFIX "qpmin", &val );
@@ -821,6 +813,14 @@ static int  Open ( vlc_object_t *p_this )
 #endif
     }
 
+#if X264_BUILD < 48
+    /* cbr = 1 overrides qp or crf and sets an average bitrate
+       but maxrate = average bitrate is needed for "real" CBR */
+    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
+
 #if X264_BUILD >= 24
     var_Get( p_enc, SOUT_CFG_PREFIX "ratetol", &val );
     p_sys->param.rc.f_rate_tolerance = val.f_float;