From patchwork Sun Mar 7 00:15:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26237 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 E867A449AD5 for ; Sun, 7 Mar 2021 02:16:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2341689A91; Sun, 7 Mar 2021 02:16:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5C88687F3F for ; Sun, 7 Mar 2021 02:16:08 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id w1so12321799ejf.11 for ; Sat, 06 Mar 2021 16:16:08 -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:reply-to:mime-version :content-transfer-encoding; bh=OMe8pccLRyA1tTSCHnyfLYXZ5wTwd7f9yy9/xxnzXv0=; b=EYSmHsHHEkrR8yd3M23uCaf58hI1nQSUT6daa6sJwW7iSvNOyAyRElP4NCHbqHRQ/Q wgJvEC2SXp7EMOG5pwyMJnIIBuABOfSVk6io8Zjx3qgJBcpLZmfVna5RCHFgwkP30Msg zIbivae2CKORjd9lTM5WmeXFTCDqcqVleoRA8sORPOVkKiaU8WNgqR3RcBceLOiZ/PhG c5HRwspJnsW5kWA5R3UOMUFOxStmIkMaD5PAsYWHGLHUot5R2IIQ/Qa4aQ7VRhY10aCN dkeIN6LZj9qC4BL2CydtRtYCRpJn7qEsUUVTLWe6Qqb66voVNZ0g5DWocKClyQdEwvAC cgnw== 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:reply-to :mime-version:content-transfer-encoding; bh=OMe8pccLRyA1tTSCHnyfLYXZ5wTwd7f9yy9/xxnzXv0=; b=p2V40j3TRXPqnVPw/Vu0DHeayb2dxDkeYLkgqofMwxFFW58LKmy9qBkZru/FVr6KWF 5kXV+ey4egDW8Ap+z6lCjyCt4jv6I1jKed2EVcpAc+t31VPTxnz2LJuQx9+ncC6XJL/x 7jWJpuipIpgBK6SPhERDt/1PnBmcoAFdGxjVtYF9mMGyjzfEQhR9506jIJPoPX+TMd+l 2Hlajxf82R3/Pkjc/FjzchFAvzEzJ83149iucpFv2RVltulQ9e+pMvS+ofzZt815AqeQ dD3oZaDbCEzok/QFMMRVeqVAWeWB9bOmIQK5Ikw+TXbG82fnK16CSiT/1ndqvi39fEFH COpA== X-Gm-Message-State: AOAM530UlLKvZO16ae/uIPuq+t3lF4r56xXbNzzdUeWb6uva0gVwMXlc qwyVCIrV409t418IUrAFAHLVdjx4ll0= X-Google-Smtp-Source: ABdhPJw4EW4DFAMjLePSn9Q1VvS3V4O47ZX6Z/EAMwn5lrNkvj4zxb26g3h9PuKA1CxroAr+lgrn4g== X-Received: by 2002:a17:906:75a:: with SMTP id z26mr8624106ejb.22.1615076168176; Sat, 06 Mar 2021 16:16:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 16:16:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 01:15:57 +0100 Message-Id: <20210307001601.2126517-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/avcodec: Don't suggest calling deprecated avcodec_register_all() 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" Despite avcodec_register and avcodec_register_all being deprecated, their documentation still said that one of them has to be called before doing anything else. Clarify this confusing situation. Furthermore, don't use avcodec_register_all in sample code for a non-deprecated function. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 309d9965be..46d31b34ad 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2708,25 +2708,13 @@ const char *avcodec_license(void); #if FF_API_NEXT /** - * Register the codec codec and initialize libavcodec. - * - * @warning either this function or avcodec_register_all() must be called - * before any other libavcodec functions. - * - * @see avcodec_register_all() + * @deprecated Calling this function is unnecessary. */ attribute_deprecated void avcodec_register(AVCodec *codec); /** - * Register all the codecs, parsers and bitstream filters which were enabled at - * configuration time. If you do not call this function you can select exactly - * which formats you want to support, by using the individual registration - * functions. - * - * @see avcodec_register - * @see av_register_codec_parser - * @see av_register_bitstream_filter + * @deprecated Calling this function is unnecessary. */ attribute_deprecated void avcodec_register_all(void); @@ -2843,7 +2831,6 @@ int avcodec_parameters_to_context(AVCodecContext *codec, * @ref avcodec_receive_frame()). * * @code - * avcodec_register_all(); * av_dict_set(&opts, "b", "2.5M", 0); * codec = avcodec_find_decoder(AV_CODEC_ID_H264); * if (!codec) From patchwork Sun Mar 7 00:15:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26238 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 25A8A449AD5 for ; Sun, 7 Mar 2021 02:16:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0867168A571; 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-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC05168814E for ; Sun, 7 Mar 2021 02:16:27 +0200 (EET) Received: by mail-ej1-f44.google.com with SMTP id c10so12290806ejx.9 for ; Sat, 06 Mar 2021 16:16:27 -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=wNUqchvGl1Nu3O59jG5Zcz/OGt7cKrSG9MoJw+N0tkI=; b=JGC9cxdrFrnneycmg1Th/doVMEQzR2PbcOW8ybfbyUQsVwl1FDXwPDaH5N35CJy4ot vvfnE3VuwsLMSVFhEG5H9SMvZrBYpSxSRXnBwNql4b7tAKYm+I7ksA9EJGakgGpVLL/k cQPAuU5eb8HBdEiX+W5PJlIJJDNk2lUeHZbmGvFP1wTgM8Lt+Uk5nZnYSl72WQvZMcYm 9X+arRIsSHprPAB4Iq9A3iHa5LSCO9LBNqojit921289vPOwL/3ASIPJ9A9V4OJtUTGl 7S/XXfLjd2AI5fVpc+WFLecMm/rZzwnnVSGJIYRcYP8bQaicleTIqJyxL9mu98r8JIF+ XDyw== 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=wNUqchvGl1Nu3O59jG5Zcz/OGt7cKrSG9MoJw+N0tkI=; b=Jx6BJdS7BM8MaIRpaHS56VZT/aa6i2UXFTyqzzssfXPdiPiNZiiRmshcpWOPwqdUnu s6SMMXVRl+ktcDN2zTYAtZlgVno7O8ATjjy9BcCThgGN9Grix4OJovXRj1oOIFXPlZn8 NkyqoXHwOk2xUiUSf0eiBFs+tgxHshPKBxU66S0jtuaeAHtm7h4O15UiELjGxs3DBQC8 C/zucwrgYXtgxLOOvzwr4wc4ZiS1AwFXbW+KZW4ilrnVzuLeBKeUIi68HhzkoYjhXP88 oUB5XFWDNfXPj6Rpvj/QWDL5S0aGvJie2P8GWqfKIFYp4QbEKpBFX7xEdbxQm6gLpu3r fgQw== X-Gm-Message-State: AOAM531TJewSVcd9HhlBmGLD+PrWcLc6FZn8CgSr9tlFDD+BLYF7NDxL 1SL3JB4ICVyr2yWdG9qTtFU7CfG46nc= X-Google-Smtp-Source: ABdhPJy4/8t0E5lzg+MG8X49TZhU527RcMGu4A/4oTGLHN2a9rj1RyHh1Pc61lG0ZyKW+70doR+mnQ== X-Received: by 2002:a17:906:719b:: with SMTP id h27mr8574690ejk.123.1615076187238; 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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 16:16:26 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 01:15:58 +0100 Message-Id: <20210307001601.2126517-2-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 2/5] avcodec/codec: Update init_static_data doxygen 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/codec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/codec.h b/libavcodec/codec.h index 0ccbf0eb19..d3547055e6 100644 --- a/libavcodec/codec.h +++ b/libavcodec/codec.h @@ -259,7 +259,7 @@ typedef struct AVCodec { const AVCodecDefault *defaults; /** - * Initialize codec static data, called from avcodec_register(). + * Initialize codec static data, called from av_codec_iterate(). * * This is not intended for time consuming operations as it is * run for every codec regardless of that codec being used. 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 */ 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 */ From patchwork Sun Mar 7 00:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26241 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 01A2A449AD5 for ; Sun, 7 Mar 2021 02:16:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6E9F68A83C; Sun, 7 Mar 2021 02:16:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BAEA68A636 for ; Sun, 7 Mar 2021 02:16:30 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id jt13so12380105ejb.0 for ; Sat, 06 Mar 2021 16:16:30 -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=ZUx8gWbtBzXs+YIIqWbMHje5L+WbewZ3nmNrQh107FI=; b=DdJGfMPHkOMbSJM/V3CZj/2UI1jc/nG7D2A4+oIAyrwMCZ0DyPvo0QjwUO6JdANOQJ dKZBfja16HNCkVJmTfyEEV/uyKDh/ARvH8CYwLWVWe805/Dn96mV+z+dLL21s4z6KAKP epH8vROEFhTMZdcefPZUudlJy2q8KH0QjiPSRMjtsFGuzsMxT1Xo6/oSDDwlrCMI5y/8 0XbYbRMAzT18/F+xZlfR5UESFmbyiAM8VKp52Rpuwo35J6LGpREk47JDUNnvYk/RlM46 d1OQXrZuA0xGeTUvbAnAkqcWZi4Ea/erD4omV196ipTGTjT1oJWLISGNUpP/gAXbvOoS 3ffg== 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=ZUx8gWbtBzXs+YIIqWbMHje5L+WbewZ3nmNrQh107FI=; b=gUesOP7j3f0ydFM43XsnsYO+SE7ZA7ho5qHaAVKulDOHrTdTKNlNsnFKbahysSqmaW 9aFYZDvOKS9ZqKojkijmHmm4N3NGlm9o+jK4ybHUuArouYwdfxosm9cWTso/3QzDIuiv hfqWsha1+SOCPr5jD/T4BH0aIxm2nmcr/9AhjQoGdClU7k33AdKJo9YVSKOrHgMOMRr8 zYZMiHqjQfq4U2qrBI/wuNBXiuh4KF/j05Em2GwUFeu5q1gt/lUndDPIW5ErU5B87Baq K4o4oUr274iN9JCZOTx+Jp+ft2o7y+pi1SQKP8ssmaN+8/2lwTEXS5xuYq4PfXkHgMEa pTdw== X-Gm-Message-State: AOAM531IqW0J1Emt4s8RxKHk9zL35N6CSKY34QEFb9wuAMZ4EUPlTVFs 5KHT9Lx/l9wS3m49KrzpVQz8+mLyFYg= X-Google-Smtp-Source: ABdhPJwhy2QPUNSUWDPjJ8catLbOpfSNbyckygS+WQbi8VHEnzQDCQbdxWTTDf5TlnktovDjI4zNPA== X-Received: by 2002:a17:906:9442:: with SMTP id z2mr9125034ejx.79.1615076189362; Sat, 06 Mar 2021 16:16:29 -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:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 01:16:01 +0100 Message-Id: <20210307001601.2126517-5-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 5/5] doc/muxers.texi: Readd documentation removed accidentally 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" Happened in e7c04eaf50b4b50f2528ab2c69b76777a1862535. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 1f9f2937f8..74833d7611 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -242,6 +242,8 @@ This is a deprecated option to set the segment length in microseconds, use @var{ @item seg_duration @var{duration} Set the segment length in seconds (fractional value can be set). The value is treated as average segment duration when @var{use_template} is enabled and +@var{use_timeline} is disabled and as minimum segment duration for all the other +use cases. @item frag_duration @var{duration} Set the length in seconds of fragments within segments (fractional value can be set). @item frag_type @var{type}