From patchwork Mon Jan 16 13:38:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1038405pzb; Mon, 16 Jan 2023 05:41:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXvzJrFZEb9zY0v+iZeh9mj1Q5DiIR9pxmYQudcGD7BsPJ1w9dqAF/m/3pGqdXQBrKvVPxWF X-Received: by 2002:aa7:d411:0:b0:492:bf3d:1a16 with SMTP id z17-20020aa7d411000000b00492bf3d1a16mr37398920edq.4.1673876506067; Mon, 16 Jan 2023 05:41:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876506; cv=none; d=google.com; s=arc-20160816; b=j+ZwmP5vpTIYgVxcri7EbwHBFrXv4UsxnuhZbXHaYqiMszz3qLbJUwwaVUzil/Eipg evH0MHyg5CZiVo+ltmmB+TVt7D0KkO/2vXAHd6d7VNPismu0E/wkUuOcZdlykPe1wgUB pTWJHfJCIj0Il9y/grwsITCetFx/rPE+E/RBrfjfB+XhlFROVwK83z+rW5sVzXfsqzYy W/9zFeewBd1N5HPQe5t2qCu5nHkBWf5pc0eITEeox1kPMiWMBj9YTy8GXWH6Ti3E++Zb ZhlvWMLISgrffuDWvZIVlNIBat9813L4PXSttTd1++ib4qeFsImYfHieDNl+hmwCJyOR wOTA== 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:dkim-signature:delivered-to; bh=PqtqGqMAF66T58snOsIxxRz3d5dz9OzODiTEgpfFihY=; b=bh0eCQgPwqFmlFVPqQnTdO/EaNdllKsp2Af7ZPuPHlZVWZCvh/CZdXjIu6sMgbLT7s RiGGDyaNVqIcjNq14iHMj+Qh3MZkF6/YFu1Fc/WVt450Mae6EH9Yib4lL3xTX7QPirPi 7ybvUgK+Kf5afSVNHBcZazIabkVeqE4EPiRhOkMf+UoOrfuJqCM3N3RqP3v57VIqfyty tjOZt7GjzAnRWibGfKp252O3bz9+fbmCQPMK0iqG3LYXu8o/1XHzkF97fqjSqH2WAjrm Sn8I/HQ1mIt5VltcVm72jR8nQcunnoybzNOKJH45PVoPxbMIbYj3bWdyoStmjuY3On7y jQfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W0PqaVWM; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t9-20020a056402524900b0046af9fdf3f5si35587642edd.282.2023.01.16.05.41.45; Mon, 16 Jan 2023 05:41:46 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W0PqaVWM; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45D4068BDE7; Mon, 16 Jan 2023 15:39:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 863B968BDF0 for ; Mon, 16 Jan 2023 15:39:28 +0200 (EET) Received: by mail-oi1-f179.google.com with SMTP id p185so2269132oif.2 for ; Mon, 16 Jan 2023 05:39:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=u3HOSf2jvIP/0sx5uDOifekfZPM5SDDIRIewa4KgaK4=; b=W0PqaVWM/4J8uWqmu9btDRv0dsAhQS+Wi1BkKrR7cTaoqs9MPHQqsRoHDvtNFlUY1M NLlC81lKQElmhrrHIr5r2u+oYFnk7ZAliGvA8tk30WJHoNvjadQw0nioj9PF5DJ/p27M LqE4p7qsbOpfBaBG8KQLdmg0Zni46dh4u2UtSkFqa2Ij64yNBplc6RQoNBbP4ZVTGBwh u/0y14n7vZnHufV8/uQw+vbIjWsl4t8DAqgXT7h3HJuz3E04KgkM7IOl6uZrW+m5Hojd vQ5Ux900HC+M4QWQ/HxFOe4TpLrHG+YoEXZiGOKFWYjGMtPR6UWtuiIFHU58xHlpdhid 8nIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u3HOSf2jvIP/0sx5uDOifekfZPM5SDDIRIewa4KgaK4=; b=drI6w/me3GAtwcGFK5O6Qz69vovp6eT1r5+UfIdyI5ipBJ15npU77ScWxM0juKpTUk f0f500hv3BQkOshDsm6vEMv5Dwo/+0v7LWt7hS8k6NzPNNjIYPEqqPltWWEB9PzORk6S UIpFq4nRl+vy0eT1jQOEo1aZLv9ooqTyAAatLPSlyWsaq+MYNxJ6pQKsEMP34MrECKp8 XrI6Os0HUO2uELteKhBTeGp7Byd9yXgZ6TcweuaoJP4n5HNdLl6Qlkb0mvVJLNJe6Qe5 dMAl7PgldLBamTieKtx9ha3CgX0Fvnfd2bfn4WZt1zBRwiqgRWxdzOnmv5VPUtwwVvVK sfhw== X-Gm-Message-State: AFqh2kqegEVKjs53DX1qdjNSeHX6z/2GQ3qRYPzX2fhmOusepE/PIo88 wswodhyIq6fGYfmwEeBkWls4Eta8wY8= X-Received: by 2002:a05:6808:42:b0:360:c4f3:ec79 with SMTP id v2-20020a056808004200b00360c4f3ec79mr40567117oic.33.1673876366413; Mon, 16 Jan 2023 05:39:26 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:30 -0300 Message-Id: <20230116133840.512-17-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/26] avfilter: remove FF_API_BUFFERSINK_ALLOC 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: EcLOdvXoNqo0 Signed-off-by: James Almer --- libavfilter/buffersink.c | 22 ---------------------- libavfilter/buffersink.h | 36 ------------------------------------ libavfilter/version_major.h | 1 - 3 files changed, 59 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index e269cf72d1..306c283f77 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -154,28 +154,6 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, return get_frame_internal(ctx, frame, 0, nb_samples); } -#if FF_API_BUFFERSINK_ALLOC -AVBufferSinkParams *av_buffersink_params_alloc(void) -{ - static const int pixel_fmts[] = { AV_PIX_FMT_NONE }; - AVBufferSinkParams *params = av_malloc(sizeof(AVBufferSinkParams)); - if (!params) - return NULL; - - params->pixel_fmts = pixel_fmts; - return params; -} - -AVABufferSinkParams *av_abuffersink_params_alloc(void) -{ - AVABufferSinkParams *params = av_mallocz(sizeof(AVABufferSinkParams)); - - if (!params) - return NULL; - return params; -} -#endif - static av_cold int common_init(AVFilterContext *ctx) { BufferSinkContext *buf = ctx->priv; diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 01e7c747d8..64e08de53e 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -94,42 +94,6 @@ int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flag */ #define AV_BUFFERSINK_FLAG_NO_REQUEST 2 -#if FF_API_BUFFERSINK_ALLOC -/** - * Deprecated and unused struct to use for initializing a buffersink context. - */ -typedef struct AVBufferSinkParams { - const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE -} AVBufferSinkParams; - -/** - * Create an AVBufferSinkParams structure. - * - * Must be freed with av_free(). - */ -attribute_deprecated -AVBufferSinkParams *av_buffersink_params_alloc(void); - -/** - * Deprecated and unused struct to use for initializing an abuffersink context. - */ -typedef struct AVABufferSinkParams { - const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE - const int64_t *channel_layouts; ///< list of allowed channel layouts, terminated by -1 - const int *channel_counts; ///< list of allowed channel counts, terminated by -1 - int all_channel_counts; ///< if not 0, accept any channel count or layout - int *sample_rates; ///< list of allowed sample rates, terminated by -1 -} AVABufferSinkParams; - -/** - * Create an AVABufferSinkParams structure. - * - * Must be freed with av_free(). - */ -attribute_deprecated -AVABufferSinkParams *av_abuffersink_params_alloc(void); -#endif - /** * Set the frame size for an audio buffer sink. * diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h index 655e3d119d..5a8bf4eda2 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_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) #define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) #endif /* AVFILTER_VERSION_MAJOR_H */