Interface: if vbv-maxrate < bitrate, set bitrate = vbv-maxrate

This probably makes more sense to the user than setting vbv-maxrate = bitrate,
as before.

diff --git a/encoder/encoder.c b/encoder/encoder.c
index e55cbed9420a186f930ae68c27016f4c62a424a6..094152ea97be9b7b387dccc74cdbefe2a9b53e32 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -696,7 +696,7 @@ static int x264_validate_parameters( x264_t *h, int b_open )
                  h->param.rc.i_rc_method == X264_RC_ABR )
         {
             x264_log( h, X264_LOG_WARNING, "max bitrate less than average bitrate, assuming CBR\n" );
-            h->param.rc.i_vbv_max_bitrate = h->param.rc.i_bitrate;
+            h->param.rc.i_bitrate = h->param.rc.i_vbv_max_bitrate;
         }
     }
     else if( h->param.rc.i_vbv_max_bitrate )