Commit ffa4e76d authored by Loren Merritt's avatar Loren Merritt

require a ratecontrol method to be specified, it no longer defaults to cqp=26.


git-svn-id: svn://svn.videolan.org/x264/trunk@655 df754926-b1dd-0310-bc7b-ec298dee348c
parent b5ef788a
......@@ -81,7 +81,7 @@ void x264_param_default( x264_param_t *param )
param->b_cabac = 1;
param->i_cabac_init_idc = 0;
param->rc.i_rc_method = X264_RC_CQP;
param->rc.i_rc_method = X264_RC_NONE;
param->rc.i_bitrate = 0;
param->rc.f_rate_tolerance = 1.0;
param->rc.i_vbv_max_bitrate = 0;
......
......@@ -384,7 +384,7 @@ static int x264_validate_parameters( x264_t *h )
if( h->param.rc.i_rc_method < 0 || h->param.rc.i_rc_method > 2 )
{
x264_log( h, X264_LOG_ERROR, "invalid RC method\n" );
x264_log( h, X264_LOG_ERROR, "no ratecontrol method specified\n" );
return -1;
}
h->param.rc.f_rf_constant = x264_clip3f( h->param.rc.f_rf_constant, 0, 51 );
......
......@@ -35,7 +35,7 @@
#include <stdarg.h>
#define X264_BUILD 54
#define X264_BUILD 55
/* x264_t:
* opaque handler for encoder */
......@@ -74,7 +74,7 @@ typedef struct x264_t x264_t;
#define X264_CQM_FLAT 0
#define X264_CQM_JVT 1
#define X264_CQM_CUSTOM 2
#define X264_RC_NONE -1
#define X264_RC_CQP 0
#define X264_RC_CRF 1
#define X264_RC_ABR 2
......
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