Commit 494cf837 authored by Panagiotis Issaris's avatar Panagiotis Issaris

Remove the "lmax" OptionDef. The equally named AVOption takes over its function.

A unit change is involved, but as AVOption parameters are now parsed with
ff_eval2(), you can use the QP2LAMBDA constant to ease the change:
ffmpeg -i src.ext -lmax 21*QP2LAMBDA dst.ext

Originally committed as revision 6367 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent eeebe6ad
...@@ -108,7 +108,6 @@ static int frame_rate = 25; ...@@ -108,7 +108,6 @@ static int frame_rate = 25;
static int frame_rate_base = 1; static int frame_rate_base = 1;
static float video_qscale = 0; static float video_qscale = 0;
static int video_lmin = 2*FF_QP2LAMBDA; static int video_lmin = 2*FF_QP2LAMBDA;
static int video_lmax = 31*FF_QP2LAMBDA;
static int video_mb_lmin = 2*FF_QP2LAMBDA; static int video_mb_lmin = 2*FF_QP2LAMBDA;
static int video_mb_lmax = 31*FF_QP2LAMBDA; static int video_mb_lmax = 31*FF_QP2LAMBDA;
static int video_qdiff = 3; static int video_qdiff = 3;
...@@ -2324,11 +2323,6 @@ static void opt_qscale(const char *arg) ...@@ -2324,11 +2323,6 @@ static void opt_qscale(const char *arg)
} }
} }
static void opt_lmax(const char *arg)
{
video_lmax = atof(arg)*FF_QP2LAMBDA;
}
static void opt_lmin(const char *arg) static void opt_lmin(const char *arg)
{ {
video_lmin = atof(arg)*FF_QP2LAMBDA; video_lmin = atof(arg)*FF_QP2LAMBDA;
...@@ -2894,7 +2888,6 @@ static void new_video_stream(AVFormatContext *oc) ...@@ -2894,7 +2888,6 @@ static void new_video_stream(AVFormatContext *oc)
video_enc->inter_matrix = inter_matrix; video_enc->inter_matrix = inter_matrix;
video_enc->lmin = video_lmin; video_enc->lmin = video_lmin;
video_enc->lmax = video_lmax;
video_enc->mb_lmin = video_mb_lmin; video_enc->mb_lmin = video_mb_lmin;
video_enc->mb_lmax = video_mb_lmax; video_enc->mb_lmax = video_mb_lmax;
video_enc->max_qdiff = video_qdiff; video_enc->max_qdiff = video_qdiff;
...@@ -3819,7 +3812,6 @@ const OptionDef options[] = { ...@@ -3819,7 +3812,6 @@ const OptionDef options[] = {
{ "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" }, { "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" },
{ "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" }, { "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantiser scale (VBR)", "q" },
{ "lmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmin}, "min video lagrange factor (VBR)", "lambda" }, { "lmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmin}, "min video lagrange factor (VBR)", "lambda" },
{ "lmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_lmax}, "max video lagrange factor (VBR)", "lambda" },
{ "mblmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmin}, "min macroblock quantiser scale (VBR)", "q" }, { "mblmin", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmin}, "min macroblock quantiser scale (VBR)", "q" },
{ "mblmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmax}, "max macroblock quantiser scale (VBR)", "q" }, { "mblmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmax}, "max macroblock quantiser scale (VBR)", "q" },
{ "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" }, { "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" },
......
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