Commit f26695ec authored by takis's avatar takis

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

"b_qoffset" AVOption takes over its function and this occurs transparantly.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6270 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e859a9b4
...@@ -127,7 +127,6 @@ static char *video_rc_eq="tex^qComp"; ...@@ -127,7 +127,6 @@ static char *video_rc_eq="tex^qComp";
static int video_rc_buffer_size=0; static int video_rc_buffer_size=0;
static float video_rc_buffer_aggressivity=1.0; static float video_rc_buffer_aggressivity=1.0;
static float video_rc_initial_cplx=0; static float video_rc_initial_cplx=0;
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 me_method = ME_EPZS; static int me_method = ME_EPZS;
...@@ -2455,10 +2454,6 @@ static void opt_i_qfactor(const char *arg) ...@@ -2455,10 +2454,6 @@ static void opt_i_qfactor(const char *arg)
{ {
video_i_qfactor = atof(arg); video_i_qfactor = atof(arg);
} }
static void opt_b_qoffset(const char *arg)
{
video_b_qoffset = atof(arg);
}
static void opt_i_qoffset(const char *arg) static void opt_i_qoffset(const char *arg)
{ {
video_i_qoffset = atof(arg); video_i_qoffset = atof(arg);
...@@ -3054,7 +3049,6 @@ static void new_video_stream(AVFormatContext *oc) ...@@ -3054,7 +3049,6 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->rc_initial_cplx= video_rc_initial_cplx; video_enc->rc_initial_cplx= video_rc_initial_cplx;
video_enc->i_quant_factor = video_i_qfactor; video_enc->i_quant_factor = video_i_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->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;
...@@ -3967,7 +3961,6 @@ const OptionDef options[] = { ...@@ -3967,7 +3961,6 @@ const OptionDef options[] = {
{ "qsquish", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qsquish}, "how to keep quantiser between qmin and qmax (0 = clip, 1 = use differentiable function)", "squish" }, { "qsquish", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qsquish}, "how to keep quantiser between qmin and qmax (0 = clip, 1 = use differentiable function)", "squish" },
{ "rc_init_cplx", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" }, { "rc_init_cplx", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" },
{ "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" },
{ "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" },
{ "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" },
......
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