From patchwork Sun Mar 7 00:15:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26239 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 01EC2449AD5 for ; Sun, 7 Mar 2021 02:16:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD39068A700; Sun, 7 Mar 2021 02:16:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E34F68814E for ; Sun, 7 Mar 2021 02:16:28 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id p8so12311446ejb.10 for ; Sat, 06 Mar 2021 16:16:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=FYrhBvJooSOamRmWdatQ5DNZGCQkr/zYCKV1CnyjSZc=; b=UkcTLjy4hcIVx5vGSeTELSyIP8KGk/Wzr4pJiEURwGY1G7TkUygyEnZnmunQvhuf4r +lKvWs6Lrk+MnPFvnbNJR5+UEPnb5ghRSq+9gf2BhsfNiTOSrhMwtMQNcs3wzmybhKGD nb4jBBxEoZzJG4EI1MExD7CVbA7l6LpD84uIPKEkHhbHKcQcino+hwOO/4l/uv36Soka YEnCqzZwpe8kOJDgWW+VUz3b3SsRHSsfpYrxAcLACMQNHs/03wm0kZzDXhVpWsA93kKA OsVTVo+UrhzICP++wFgdvt1YjbHHrEX+C3SDjRngf01zeFpQfaIBWgFvv3XeJc1oY8lm yfgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=FYrhBvJooSOamRmWdatQ5DNZGCQkr/zYCKV1CnyjSZc=; b=sdR4bqv3YbJMUWtQkliCRUhdeH44iB29XeMEQb9jO1K/DUm3x8DvzVgRyocq06Ufd0 fujscM1vHu8RomJgsQLvAnSzY7TwCFxHKSNCTcLAICC2ga1+i4ifmIW4/p61FM23cugy /7hIuJrgOrGq1ucOdJ1N4sgXWxtI0wCFVPsaitvGRtmKH1FIquL6OGOE6mgzyKd9NS9g KQvS0eK8JtFQKZDItc8SomXr8wJ+3h3GjgO7h4DiLpIGvC3DDypVa5yH+ZqdyGJfLD9k GMuzekdLMsXJZn5Ru+Zc3P/bI8TgNKZrn8AUuuJrPhAA7ZDBkZYLjB1JjgXtahbM6cbJ VcDA== X-Gm-Message-State: AOAM530NPfZhEzhKhpqHZvLj9xBz3v4U+9FQwB9mvZfKJK4DLHrFulqd 27dEckTmKGvXDqRr5CaEZZmWR2s/DHQ= X-Google-Smtp-Source: ABdhPJx/k7GRjAsX1UJmoXFroKXw6OWXov4ZsC69K4tiGjJb3Vco6Gl/wBhiMiB/GHSVbACDQBQqNw== X-Received: by 2002:a17:906:381a:: with SMTP id v26mr8159457ejc.346.1615076187951; Sat, 06 Mar 2021 16:16:27 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b12sm4325421eds.94.2021.03.06.16.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 16:16:27 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 01:15:59 +0100 Message-Id: <20210307001601.2126517-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210307001601.2126517-1-andreas.rheinhardt@gmail.com> References: <20210307001601.2126517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/avfilter: Remove avfilter_link_set_closed() on bump X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Deprecated in 39a09e995d32d16e4f8c87a6ff5273cb9d98146e. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 3 ++- libavfilter/avfilter.h | 4 ++-- libavfilter/version.h | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d560655f42..22ecad5f77 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -232,11 +232,12 @@ void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts ff_filter_set_ready(link->src, 200); } +#if FF_API_FILTER_LINK_SET_CLOSED void avfilter_link_set_closed(AVFilterLink *link, int closed) { ff_avfilter_link_set_out_status(link, closed ? AVERROR_EOF : 0, AV_NOPTS_VALUE); } - +#endif int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt, unsigned filt_srcpad_idx, unsigned filt_dstpad_idx) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index d43b866599..be1242436b 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -681,7 +681,7 @@ void avfilter_link_free(AVFilterLink **link); attribute_deprecated int avfilter_link_get_channels(AVFilterLink *link); #endif - +#if FF_API_FILTER_LINK_SET_CLOSED /** * Set the closed field of a link. * @deprecated applications are not supposed to mess with links, they should @@ -689,7 +689,7 @@ int avfilter_link_get_channels(AVFilterLink *link); */ attribute_deprecated void avfilter_link_set_closed(AVFilterLink *link, int closed); - +#endif /** * Negotiate the media format, dimensions, etc of all inputs to a filter. * diff --git a/libavfilter/version.h b/libavfilter/version.h index ce37b8c60e..16e2dced04 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -65,5 +65,8 @@ #ifndef FF_API_NEXT #define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) #endif +#ifndef FF_API_FILTER_LINK_SET_CLOSED +#define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8) +#endif #endif /* AVFILTER_VERSION_H */