From patchwork Sat Feb 4 10:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40261 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869668pzk; Sat, 4 Feb 2023 02:46:17 -0800 (PST) X-Google-Smtp-Source: AK7set/eSM7URfPfbANaJHcpqb6t9B3hjsnrYeE29dwNkd/XHqOLxYM+kjh3vcMWP4sfXiNuZyv6 X-Received: by 2002:a17:906:fc20:b0:860:5723:a5e5 with SMTP id ov32-20020a170906fc2000b008605723a5e5mr13153552ejb.69.1675507576978; Sat, 04 Feb 2023 02:46:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507576; cv=none; d=google.com; s=arc-20160816; b=dnJ8ZFIFhStMWYr66Y0rnA1MzA3Oidjgg5QcrDU8ypZTDJ0t31img6HulYf102XWGS crW2R1drUeePTgEuwR7+d4h+09yVwIfneUcwAYTYqejKs9dWFrAC4Mv8DIrbbFEcQ5Ip IERZjx0hLQ6biwdS51JMpe5hl36oP6+hyDy2XJmDb8o8XAojRyoSz4QlfRxBh1y/HPhs zqzxSn8UxLWFbyldJW/n5rcmhmHOYov00jTaQQkjDEDIOKZtuZ1JUjKXt46js8C9GVE4 62/UqcornsiIK2mi3ythBKaBS0kwxQIprbf2KBpIhz/nTOFsGhDBOXOIjMcrnLqaBBTt Bz6g== 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=p7h5tuqd4V1VtmvwIov6YcjBtQ/4SKCfaHzi9v3x/nA=; b=t4dGsX6eT043IixkM+kjvQFdk2F1+n8iwdXJhpy5eStkf6OW95tjakwp4RrSwFqKoS B+YbNnisPF8U7bDIsPO24LFpmhEQyipihacexdnHRheu5fW4qwwUHxq5FksFphNmlPX4 9YDzeS3fmCEJiHhR+X0Lw31CfSdtE77kZm3tJKej/1Rd6BE7c/QQk07NbviQyqjtHenM h070OsvwieAw7W94+gmbJdHsxcJhE98Glipl7eUwTLFQsz+7j52u+Y2obNwPHwwj0cTR L7GLeBMkIC7R0+yhN7bjS/O2Bcq2xUd0782SD/vPCvytMb23wmNAkQvrDrrVhidFQ6ms yCQg== 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 10-20020a170906010a00b0088e3f5f86d3si5789806eje.820.2023.02.04.02.46.16; Sat, 04 Feb 2023 02:46:16 -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 44E2968BF07; Sat, 4 Feb 2023 12:44:29 +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 D72AF68BE9E for ; Sat, 4 Feb 2023 12:44:16 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A2EFF2404EE for ; Sat, 4 Feb 2023 11:44:16 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id jm6Y2hlH26TI for ; Sat, 4 Feb 2023 11:44:16 +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 0A7D3240705 for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 0FD403A05C6 for ; Sat, 4 Feb 2023 11:44:06 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:52 +0100 Message-Id: <20230204104204.20721-22-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 21/33] avfilter: remove FF_API_SWS_PARAM_OPTION 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: 0Hn9mcJ5lE8j From: James Almer Signed-off-by: James Almer --- libavfilter/buffersrc.c | 11 ----------- libavfilter/version_major.h | 1 - 2 files changed, 12 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index ae8bba19b07..ba17450b937 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -50,9 +50,6 @@ typedef struct BufferSourceContext { int w, h; enum AVPixelFormat pix_fmt; AVRational pixel_aspect; -#if FF_API_SWS_PARAM_OPTION - char *sws_param; -#endif AVBufferRef *hw_frames_ctx; @@ -287,11 +284,6 @@ static av_cold int init_video(AVFilterContext *ctx) c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, c->pixel_aspect.num, c->pixel_aspect.den); -#if FF_API_SWS_PARAM_OPTION - if (c->sws_param) - av_log(ctx, AV_LOG_WARNING, "sws_param option is deprecated and ignored\n"); -#endif - return 0; } @@ -313,9 +305,6 @@ static const AVOption buffer_options[] = { { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, -#if FF_API_SWS_PARAM_OPTION - { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, -#endif { NULL }, }; diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h index de0cf6e9793..655e3d119d2 100644 --- a/libavfilter/version_major.h +++ b/libavfilter/version_major.h @@ -35,7 +35,6 @@ * the public API and may change, break or disappear at any time. */ -#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9) #define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) #define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9)