From 494cf837021d68190e3ce45ef763e3b123bf7958 Mon Sep 17 00:00:00 2001 From: Panagiotis Issaris Date: Thu, 28 Sep 2006 17:44:13 +0000 Subject: [PATCH] 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 --- ffmpeg.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index dc8673fd5c..172d827faa 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -108,7 +108,6 @@ static int frame_rate = 25; static int frame_rate_base = 1; static float video_qscale = 0; 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_lmax = 31*FF_QP2LAMBDA; static int video_qdiff = 3; @@ -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) { video_lmin = atof(arg)*FF_QP2LAMBDA; @@ -2894,7 +2888,6 @@ static void new_video_stream(AVFormatContext *oc) video_enc->inter_matrix = inter_matrix; video_enc->lmin = video_lmin; - video_enc->lmax = video_lmax; video_enc->mb_lmin = video_mb_lmin; video_enc->mb_lmax = video_mb_lmax; video_enc->max_qdiff = video_qdiff; @@ -3819,7 +3812,6 @@ const OptionDef options[] = { { "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" }, { "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" }, { "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" },