diff options
| author | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-09-20 08:36:33 +0000 |
|---|---|---|
| committer | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-09-20 08:36:33 +0000 |
| commit | 6bacd250f45a2099b2cc41151bf5ed297fa2e22d (patch) | |
| tree | 5d8d16a56880422c1f4fec7d1696b21c24cfa008 | |
| parent | 5687a2f4cc90a2530a147174a482acef224a1fe9 (diff) | |
| download | ffmpeg-6bacd250f45a2099b2cc41151bf5ed297fa2e22d.tar.gz | |
Remove the "qmax" OptionDef.
Originally committed as revision 6298 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffmpeg.c | 13 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 1 insertions, 14 deletions
@@ -106,7 +106,6 @@ static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX}; static int frame_rate = 25; static int frame_rate_base = 1; static float video_qscale = 0; -static int video_qmax = 31; static int video_lmin = 2*FF_QP2LAMBDA; static int video_lmax = 31*FF_QP2LAMBDA; static int video_mb_lmin = 2*FF_QP2LAMBDA; @@ -2364,16 +2363,6 @@ static void opt_lmin(const char *arg) video_lmin = atof(arg)*FF_QP2LAMBDA; } -static void opt_qmax(const char *arg) -{ - video_qmax = atoi(arg); - if (video_qmax < 1 || - video_qmax > 51) { - fprintf(stderr, "qmax must be >= 1 and <= 51\n"); - exit(1); - } -} - static void opt_mb_lmin(const char *arg) { video_mb_lmin = atof(arg)*FF_QP2LAMBDA; @@ -2944,7 +2933,6 @@ static void new_video_stream(AVFormatContext *oc) if(inter_matrix) video_enc->inter_matrix = inter_matrix; - video_enc->qmax = video_qmax; video_enc->lmin = video_lmin; video_enc->lmax = video_lmax; video_enc->rc_qsquish = video_qsquish; @@ -3880,7 +3868,6 @@ const OptionDef options[] = { { "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" }, { "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" }, - { "qmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qmax}, "max 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" }, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1a1845ef05..0fea523b97 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -505,7 +505,7 @@ static const AVOption options[]={ {"qcomp", "video quantiser scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, 0.5, FLT_MIN, FLT_MAX, V|E}, {"qblur", "video quantiser scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, 0.5, FLT_MIN, FLT_MAX, V|E}, {"qmin", "min video quantiser scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 1, 51, V|E}, -{"qmax", "max video quantiser scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, INT_MAX, V|E}, +{"qmax", "max video quantiser scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 1, 51, V|E}, {"qdiff", "max difference between the quantiser scale (VBR)", OFFSET(max_qdiff), FF_OPT_TYPE_INT, 3, INT_MIN, INT_MAX, V|E}, {"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, 0, FF_MAX_B_FRAMES, V|E}, {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, 1.25, FLT_MIN, FLT_MAX, V|E}, |