Commit cfed3422 authored by takis's avatar takis

Remove the "pbias" OptionDef option from ffmpeg.c. The equally named "pbias"

AVOption takes over its function and this occurs transparantly.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6265 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bd555610
...@@ -133,7 +133,6 @@ static float video_b_qfactor = 1.25; ...@@ -133,7 +133,6 @@ static float video_b_qfactor = 1.25;
static float video_b_qoffset = 1.25; static float video_b_qoffset = 1.25;
static float video_i_qfactor = -0.8; static float video_i_qfactor = -0.8;
static float video_i_qoffset = 0.0; static float video_i_qoffset = 0.0;
static int video_inter_quant_bias= FF_DEFAULT_QUANT_BIAS;
static int me_method = ME_EPZS; static int me_method = ME_EPZS;
static int video_disable = 0; static int video_disable = 0;
static int video_discard = 0; static int video_discard = 0;
...@@ -2482,11 +2481,6 @@ static void opt_i_qoffset(const char *arg) ...@@ -2482,11 +2481,6 @@ static void opt_i_qoffset(const char *arg)
video_i_qoffset = atof(arg); video_i_qoffset = atof(arg);
} }
static void opt_pbias(const char *arg)
{
video_inter_quant_bias = atoi(arg);
}
static void opt_packet_size(const char *arg) static void opt_packet_size(const char *arg)
{ {
packet_size= atoi(arg); packet_size= atoi(arg);
...@@ -3084,7 +3078,6 @@ static void new_video_stream(AVFormatContext *oc) ...@@ -3084,7 +3078,6 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->b_quant_factor = video_b_qfactor; video_enc->b_quant_factor = video_b_qfactor;
video_enc->i_quant_offset = video_i_qoffset; video_enc->i_quant_offset = video_i_qoffset;
video_enc->b_quant_offset = video_b_qoffset; video_enc->b_quant_offset = video_b_qoffset;
video_enc->inter_quant_bias = video_inter_quant_bias;
video_enc->me_threshold= me_threshold; video_enc->me_threshold= me_threshold;
video_enc->mb_threshold= mb_threshold; video_enc->mb_threshold= mb_threshold;
video_enc->intra_dc_precision= intra_dc_precision - 8; video_enc->intra_dc_precision= intra_dc_precision - 8;
...@@ -4002,7 +3995,6 @@ const OptionDef options[] = { ...@@ -4002,7 +3995,6 @@ const OptionDef options[] = {
{ "i_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" }, { "i_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" },
{ "b_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qoffset}, "qp offset between p and b frames", "offset" }, { "b_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qoffset}, "qp offset between p and b frames", "offset" },
{ "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" }, { "i_qoffset", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qoffset}, "qp offset between p and i frames", "offset" },
{ "pbias", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_pbias}, "inter quant bias", "bias" },
{ "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" }, { "rc_eq", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_eq}, "set rate control equation", "equation" },
{ "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" }, { "rc_override", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_video_rc_override_string}, "rate control override for specific intervals", "override" },
{ "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" }, { "bt", HAS_ARG | OPT_VIDEO, {(void*)opt_video_bitrate_tolerance}, "set video bitrate tolerance (in kbit/s)", "tolerance" },
......
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