Backport of from trunk [24676]: Make default tradeoff for bitrate instead of...

Backport of from trunk [24676]: Make default tradeoff for bitrate instead of quality when CBR is requested.

modules/codec/ffmpeg/encoder.c

@@ -458,6 +458,8 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
 
         if ( p_sys->b_strict_rc )
         {
+/*            p_context->rc_qsquish = 1.0;
+            p_context->rc_initial_cplx = 1;*/
             p_context->rc_min_rate = p_enc->fmt_out.i_bitrate;
             p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
             p_context->rc_buffer_size = p_sys->i_rc_buffer_size;
@@ -519,6 +521,16 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
         if( p_sys->i_vtolerance > 0 )
             p_context->bit_rate_tolerance = p_sys->i_vtolerance;
 
+        /* usually if someone sets bitrate, he likes more to get that bitrate
+         * over quality should help 'normal' user to get asked bitrate
+         */
+        if( (p_enc->fmt_out.i_bitrate > 0) &&
+            (p_sys->i_qmax == 0) && (p_sys->i_qmin == 0) )
+        {
+            p_sys->i_qmax = 51;
+            p_sys->i_qmin = 10;
+        }
+
         if( p_sys->i_qmin > 0 )
         {
             p_context->mb_qmin = p_context->qmin = p_sys->i_qmin;