From fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 9 Oct 2012 17:40:20 +0200 Subject: avconv: remove -same_quant It has not worked for anything other than fringe codecs (asv1/2, mdec, mjpeg[b]) since about 2003 and nobody ever noticed or complained. This sufficiently proves that there are no users of this option who have a clue of what they are doing, so it is completely useless. --- avconv_opt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'avconv_opt.c') diff --git a/avconv_opt.c b/avconv_opt.c index f8a76c0978..9f30134055 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -71,7 +71,6 @@ int copy_tb = 1; int exit_on_error = 0; int print_stats = 1; int qp_hist = 0; -int same_quant = 0; static int file_overwrite = 0; static int video_discard = 0; @@ -836,7 +835,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e } MATCH_PER_STREAM_OPT(qscale, dbl, qscale, oc, st); - if (qscale >= 0 || same_quant) { + if (qscale >= 0) { st->codec->flags |= CODEC_FLAG_QSCALE; st->codec->global_quality = FF_QP2LAMBDA * qscale; } @@ -1969,8 +1968,6 @@ const OptionDef options[] = { "rate control override for specific intervals", "override" }, { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE, { .func_arg = opt_video_codec }, "force video codec ('copy' to copy stream)", "codec" }, - { "same_quant", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &same_quant }, - "use same quantizer as source (implies VBR)" }, { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT, { .off = OFFSET(pass) }, "select the pass number (1 or 2)", "n" }, { "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC, { .off = OFFSET(passlogfiles) }, -- cgit v1.2.3