From patchwork Mon Nov 15 15:23:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 31429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp5991719iob; Mon, 15 Nov 2021 07:25:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyaaDQ7sFfLyPkM2pT+C5IXLR9sLq7Ui7jg7+IyOp5weJy8ykfRRAIbOD774aovsKSOLRNz X-Received: by 2002:a17:907:7ba4:: with SMTP id ne36mr1390450ejc.227.1636989917944; Mon, 15 Nov 2021 07:25:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636989917; cv=none; d=google.com; s=arc-20160816; b=Kxre3WjAwjVAC0St8dFZFe+CzPeJ48FOTjro5P6gSFmBFcpNJGX7v9f7MHrfyhc+0/ XyaHBya+yHXu0BYUvaYpiFVn18cqBB5KCbV647bHhp3Qe+L3CReJs5a9tX2rgq1Jwo4q mOseBExTJ8Hs83YFPpkDs1xfFiW//E+GXktQu7U3upiI5rHHGD+4l6ENo/MCN0rDJRD5 jIIyzot+He+qBT1HvWq8xdu460mV/5mdDL0M59Ap8u8x+Q0XaeoQAZjN87J8/ths7Bon B0G60qlMNw4i/bG0aDPAqcMskWK4ZPsrNawruXqeTkoel7B8MMXsHi2F3oL4voPhInJl 1sag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=opMzdrMlEHwOHWq1RVurp5XzSMPAwL7Mu4V/fGBcq8U=; b=fAsuB470I9+UFgLxuM54VuP4Hy3AV/vxvG6DjMaKm6CWxj99JdMZ5uJzwm8DxHkUOO JpZ0+qtmLrtoUzSFrGGQoRG257IWbVrMW9Du4WGmIwS2Bw5+cTqjiT9RNzwAlk6aTeoI lqbGBxzy5W3Ri0v5t5U64VzA+pMqAqis7WRIotJxQfRem2cReAwT9WdfvRYUwU8iaHRV Ep9t5nNM2GOXMG++9ACSFy23WgOzo+zr+J8H4zPmcAcb07RpuMvkFObwFUtrBKfPe8XP 30BtXod11cvxRU65Dt7aIPOpJ0WDHz3vTyDFmECdwz0XtgBqgCIapTrS5JFrgRaclbJ3 AirA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x17si22792166ejj.434.2021.11.15.07.25.17; Mon, 15 Nov 2021 07:25:17 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 56F0768AE52; Mon, 15 Nov 2021 17:24:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85F2C68AE4B for ; Mon, 15 Nov 2021 17:24:14 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E447C24017C for ; Mon, 15 Nov 2021 16:24:11 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id OMBtgt2_zCPr for ; Mon, 15 Nov 2021 16:24:11 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id BB8A9240179 for ; Mon, 15 Nov 2021 16:24:07 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 792923A0769; Mon, 15 Nov 2021 16:24:07 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Nov 2021 16:23:57 +0100 Message-Id: <20211115152400.5522-6-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211115152400.5522-1-anton@khirnov.net> References: <20211115152400.5522-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] ffmpeg: drop -sameq/-samequant options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3KdXDYFxxaMW They did nothing but return an error since 2012. --- fftools/ffmpeg_opt.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index f8e6115241..f0f7051392 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -303,15 +303,6 @@ static int opt_stats_period(void *optctx, const char *opt, const char *arg) return 0; } -static int opt_sameq(void *optctx, const char *opt, const char *arg) -{ - av_log(NULL, AV_LOG_ERROR, "Option '%s' was removed. " - "If you are looking for an option to preserve the quality (which is not " - "what -%s was for), use -qscale 0 or an equivalent quality factor option.\n", - opt, opt); - return AVERROR(EINVAL); -} - static int opt_audio_codec(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; @@ -3755,10 +3746,6 @@ const OptionDef options[] = { { "vcodec", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_INPUT | OPT_OUTPUT, { .func_arg = opt_video_codec }, "force video codec ('copy' to copy stream)", "codec" }, - { "sameq", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_sameq }, - "Removed" }, - { "same_quant", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_sameq }, - "Removed" }, { "timecode", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_timecode }, "set initial TimeCode value.", "hh:mm:ss[:;.]ff" }, { "pass", OPT_VIDEO | HAS_ARG | OPT_SPEC | OPT_INT | OPT_OUTPUT, { .off = OFFSET(pass) },