From patchwork Mon Dec 18 09:57:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45215 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp7222174pzf; Mon, 18 Dec 2023 01:59:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGi8PJ1feCiWLfnczaKG8ng0ooJbyiiJUMnq11rEoVcAbTUNAVgQHzEO79VVtFJupwqwZGt X-Received: by 2002:a50:c259:0:b0:553:385:eb43 with SMTP id t25-20020a50c259000000b005530385eb43mr1817403edf.43.1702893570719; Mon, 18 Dec 2023 01:59:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702893570; cv=none; d=google.com; s=arc-20160816; b=R14iBYy5sT2mQasc3aABAhpVfcnVL0acwJXQ+iKfTbNlmq2hd/eR2/9OswMasPY6OI ogEbifXX00fyABupdJ2wNLhnd8Nt1En8GKdnpPnNVQYZTpl0WZIJs638MrD2gk+2pxjv bGbF4KxvMd3cCKpQn60ovDfoJs6d3ipRAuMsZYXspQyHpdYfXxLng9P5rbi8IhiauUos SZUappydMc2UJjsTjak8JJqlOZq2iOVn5TwQSZV4tbywvtGru5rQdcxJGzY6I0PxV13l 1Gqfyh1Bps6CKX+OdlvU1A+1Wbn8Wnkg56XDVsmg0r5jr14ixhQL8lHKTYyb/Rb6FFP9 VVEg== 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=YUJznQHL0EyVlXv5TZAK4vHEh1vNVGMST80L/YUiKsY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=veAmm6B08aC9GzNoehChe1Pt4Azlp7lN1JY7ZNC49HjBGo3xbJuI1q/+1SINqfoTMq J7j3qdjRVWwXD+McQq9wybHkqbXqRaFS0JiMmGWMr7dwGMs/Irzlh86YKpKmP1wDVe/U AWZuYnA3/F3wbO8jNiE+K3K75yYx3YHNKnIBND50r0/nf93zEDOtVUgbRQFOaVQNWLI9 TEsHGoCWEUJYSF+62qJ39VsfZfY2ILlHlKqCsY5vjzscjl/U9KdyNJ+bi9+L5wRtU13J NJDoq0RTITGD0UhmO4lUhgv32BDzx6AmT9eAxr8qmg1G89IWqFblIB71UChlejO2muux pNIA== 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 y6-20020a056402358600b0054cfdc63db8si10180371edc.355.2023.12.18.01.59.30; Mon, 18 Dec 2023 01:59:30 -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 CCE0768D21A; Mon, 18 Dec 2023 11:58:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EBA068D1E5 for ; Mon, 18 Dec 2023 11:58:00 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id B8BA91FB0 for ; Mon, 18 Dec 2023 10:57:57 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id COQBeGHjZEC2 for ; Mon, 18 Dec 2023 10:57:57 +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 mail1.khirnov.net (Postfix) with ESMTPS id A9C51466E for ; Mon, 18 Dec 2023 10:57:51 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D35AB3A0A0B for ; Mon, 18 Dec 2023 10:57:44 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Dec 2023 10:57:22 +0100 Message-ID: <20231218095722.25879-20-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231218095722.25879-1-anton@khirnov.net> References: <20231218095722.25879-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/20] fftools/ffmpeg: remove deprecated -[av]bsf 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: 4WylvEftjK2x They were marked as deprecated over 10 years ago. --- doc/ffmpeg.texi | 4 ---- fftools/ffmpeg_opt.c | 13 ++----------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 6ecd5f3cfe..bbe70a4f85 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1054,8 +1054,6 @@ Specify which version of the vstats format to use. Default is @code{2}. See the @item -vtag @var{fourcc/tag} (@emph{output}) Force video tag/fourcc. This is an alias for @code{-tag:v}. -@item -vbsf @var{bitstream_filter} -Deprecated see -bsf @item -force_key_frames[:@var{stream_specifier}] @var{time}[,@var{time}...] (@emph{output,per-stream}) @item -force_key_frames[:@var{stream_specifier}] expr:@var{expr} (@emph{output,per-stream}) @@ -1424,8 +1422,6 @@ This is an alias for @code{-filter:a}, see the @ref{filter_option,,-filter optio @table @option @item -atag @var{fourcc/tag} (@emph{output}) Force audio tag/fourcc. This is an alias for @code{-tag:a}. -@item -absf @var{bitstream_filter} -Deprecated, see -bsf @item -guess_layout_max @var{channels} (@emph{input,per-stream}) If some input channel layout is not known, try to guess only if it corresponds to at most the specified number of channels. For example, 2 diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 2984c494cd..b7d636f16f 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1917,18 +1917,9 @@ const OptionDef options[] = { "0 = use frame rate (video) or sample rate (audio)," "-1 = match source time base", "ratio" }, - { "bsf", OPT_TYPE_STRING, OPT_SPEC | OPT_EXPERT | OPT_OUTPUT | OPT_HAS_ALT, + { "bsf", OPT_TYPE_STRING, OPT_SPEC | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(bitstream_filters) }, - "A comma-separated list of bitstream filters", "bitstream_filters", - .u1.names_alt = alt_bsf, }, - { "absf", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, - { .func_arg = opt_old2new }, - "deprecated", "audio bitstream_filters", - .u1.name_canon = "bsf", }, - { "vbsf", OPT_TYPE_FUNC, OPT_VIDEO | OPT_FUNC_ARG | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, - { .func_arg = opt_old2new }, - "deprecated", "video bitstream_filters", - .u1.name_canon = "bsf", }, + "A comma-separated list of bitstream filters", "bitstream_filters", }, { "apre", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_AUDIO | OPT_EXPERT| OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_preset },