From patchwork Sun Mar 7 00:16:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26240 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 069B9449AD5 for ; Sun, 7 Mar 2021 02:16:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB09068A91B; Sun, 7 Mar 2021 02:16:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50B67689AEA for ; Sun, 7 Mar 2021 02:16:29 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id p8so12311488ejb.10 for ; Sat, 06 Mar 2021 16:16:29 -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=YYgwIuWP4w++9jbMKhqwXYHeZBzNJ2Zq2fVEMy2hoPE=; b=jpBSO0ngB8Ht0chIN0NgFjUvwTW5y/YvIELJxXHaqVUnGAQhvbPfm4WVGI+OVQ3fws IOQ4jHEvaYxGDa09wysaFhvxAgWc7T0d6+rvc2z77eLnM8Qn5SnUrjfBtNtN9jfMQF6s 8Cxe3Y0LwUmRAuUcD+Q6eyxKwobhiRHQojVtWxShJu5PfIgaG0O34e/elqMX2yEYALxq y8vKFBC8RoDffzE30qK9xbYmh3Hevf5ZwkKofYAvWiD1QP7wKHTamCAJOFJGFPGAVYNe B2+ic9J8t03lnwNNIr2Mp/0wHj5cL3N/k+aILq0p41eTzHff+JBc9FbDlnavzlc4gQBk 5zVg== 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=YYgwIuWP4w++9jbMKhqwXYHeZBzNJ2Zq2fVEMy2hoPE=; b=BpyCYkxT/H8DO0wauk46/21XiSZlCInIAzMJE7dEwTOz2XbVDcOPnNEMfLE7OKqXJS l49KCEvkIWttxRMsXvV+A/AEMdgdJuSj74SW5b1ogqdx6/RtASnVjKqBsxvumPh6/Zk5 xtCigqiB+TQmO5veVtrm7hCAywa/FkHu+cdW9OyZAv0y4TfLq4GQlyxPzfg0U3y8+txR tRl3N4EDGuY90ZlcdGm8psrvvs+s16oW1sgsc8F8nOfDLkJtVrnNwP3KhU7uA77IG4KW f1LQVqDgqrVg0Vdrowizj/5ymXFiYt3qp6OprMmMrTSZxlJU6Iv3d45HySU2F3y1y4EG sAow== X-Gm-Message-State: AOAM530ovkaB2Q0Ga0lE1VJuuz8kfgkJkx9BBRgi1BuuYEfRCM+uLP6/ IuA2B10r34zoGf0Uvh5uZrUEIGo3fr0= X-Google-Smtp-Source: ABdhPJyivmNZko3KcNIvHcs8N0m4dTeYI6jaFgC0vUucJAwIWAlIrWdzJGOjdWnzw01DQT5N1FzjQg== X-Received: by 2002:a17:906:3648:: with SMTP id r8mr8968781ejb.58.1615076188663; Sat, 06 Mar 2021 16:16:28 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 16:16:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 01:16:00 +0100 Message-Id: <20210307001601.2126517-4-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 4/5] avfilter/buffersink: Postpone removal of av_[a]buffersink_params_alloc 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" They have been deprecated in 61097535cdaa91fea0d62c567b3af02a940f6c2d, yet this was less than two years ago. Removing them will therefore have to wait. Signed-off-by: Andreas Rheinhardt --- libavfilter/buffersink.c | 2 +- libavfilter/buffersink.h | 2 +- libavfilter/version.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 58848941d4..15d897cff6 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -148,7 +148,7 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, return get_frame_internal(ctx, frame, 0, nb_samples); } -#if FF_API_NEXT +#if FF_API_BUFFERSINK_ALLOC AVBufferSinkParams *av_buffersink_params_alloc(void) { static const int pixel_fmts[] = { AV_PIX_FMT_NONE }; diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 65d0cca747..69ed0f29a8 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -95,7 +95,7 @@ int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flag */ #define AV_BUFFERSINK_FLAG_NO_REQUEST 2 -#if FF_API_NEXT +#if FF_API_BUFFERSINK_ALLOC /** * Deprecated and unused struct to use for initializing a buffersink context. */ diff --git a/libavfilter/version.h b/libavfilter/version.h index 16e2dced04..e28a6566cb 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -68,5 +68,8 @@ #ifndef FF_API_FILTER_LINK_SET_CLOSED #define FF_API_FILTER_LINK_SET_CLOSED (LIBAVFILTER_VERSION_MAJOR < 8) #endif +#ifndef FF_API_BUFFERSINK_ALLOC +#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) +#endif #endif /* AVFILTER_VERSION_H */