From patchwork Fri Jan 5 20:50:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7151 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1219959jaa; Fri, 5 Jan 2018 12:51:24 -0800 (PST) X-Google-Smtp-Source: ACJfBoteGFKC94FWZ6K8dAYIPDjOMoxAAayiM3GYmS4GzSH3iH1lIwSgI2O7b3PDWVsm757i7Mhw X-Received: by 10.223.169.163 with SMTP id b32mr3642776wrd.208.1515185484038; Fri, 05 Jan 2018 12:51:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515185483; cv=none; d=google.com; s=arc-20160816; b=FERI1cF2Zhst3P171wWbH4Xb1j04XDgZkp6OjvPzn+S10tTTJVz03aL9aUcC7H92rQ SaWpP9DlQDfYw/90p7mkLVFTbiIwFXLC4VdKG/HEf9KhliU0aoe6NUAI1W1F5VulY7rV MkMSmRNO9C8zGG/CP1YQL9hFRm4sATj6nInEZfOJVv1IiURm0CQKYUMjll0VsY6I/f6e X1RRmZbLyne1La4XwtSpX8GfYZBiKGM9z0Y2OisAWeDG7AbmVuMfG9B02sYC8+sZ7d34 cQ7B/pI67VAqzKsTiiqNTdM9+kz5hNY9JgMEZINevLhYDPCQyfI/rpqBx53t801TRYx1 BKDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=WIiJHBgbVBEPS5/JftPMRMlOTfJPQpIX5s4sWvwtr4o=; b=ZngK3ec1gZcD56MIMZFxiPCn+VqZdzErnuwzKAZT83lgsDtnyIMYwiOdyDWnTZ+47N HzhyAoEfyKHZkOFBltsdjSb/7zGF1KAWEIDqYcrl4KHDcq5uBnpUdmVi5W0yZ9ciGWKs fh/3UxUbP5aTIAL48qPU8O6EOmQyxTAz0Pynbmy8NxsVlvBpegrQROcxAO4oGUYWaOJl zreLtjl/WogGwNa1eiNMlxoMcW+bnNoIhH0KbyLIHVEqv6EwptYtdJgoFDopXlaYoLiJ XvDFqLrDPVQtkPST2DDHoI3liaV/kXIec/vilRpqlm5cf8eaSHyzyBkGEqBwzBotludh ygHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=U2FpyU46; 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=NONE 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 e193si4302196wmf.133.2018.01.05.12.51.23; Fri, 05 Jan 2018 12:51:23 -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=20161025 header.b=U2FpyU46; 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=NONE 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 12EF9689BB4; Fri, 5 Jan 2018 22:51:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE480689B7A for ; Fri, 5 Jan 2018 22:51:16 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id i17so3114170qke.0 for ; Fri, 05 Jan 2018 12:51:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=br3+qZl0GVHXT8iwRwohmAAaeECr8k/dj6Mq8tDbdmI=; b=U2FpyU46XjOQG+o0pEQy2kahat6VM4CqmBQzOOAgruqh/KAbSiXxIp6ULY/vXZ1lw6 7PMkB/sSqLjR4k6kyqITU0fpCHLdwEiRJZKparATMqjseg3dLt0mpu50ROijyyPbiIsr jZBGV8FCvDXdSg3R2yPffHWMLNU/+QlHFYZvvAV6Hg++aK3oKDSGyvD1alQv8oQRVHT8 /efFrywNJqlq8oxi6GGKeX7OE9m9GzPRx6hR2WNEYP73gnas9wZCOgSxJJlyNtkI+NXd dFvzFYLr0EuXuTSQFEEriCVt31Mt//DYxI+TqFiWXqBZbQLkTzGVHWHaP52MEjDgwtFf wPEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=br3+qZl0GVHXT8iwRwohmAAaeECr8k/dj6Mq8tDbdmI=; b=X7/zfh/tvcYNK/IzsAkIyO4iyN7u6vOtrKxKwJhp5/iLGWN8wQlAY3tMYCYRxOlIGP fHfFOAoDRMhYfNxtaKQ7TR+CBPhfamsZnO1TM1I7VdgAcSmhD5r+AjLX+REUnlHl740g LplruJw7mKawz6n1FmFzW2x+Ysx3JQQ993ycJUVLUXBgblXu2Fz71JCksB22VQtB+C7+ cMsU3wOMhL/rl0LNxfTEyE99MAamjo8XTYt/Bp2rVon2o1WRuJ7tHOo0KrPa7oX531r4 jhiRoy+JpVrlHCMBD0fD91DdYUabXsALEqTRd2XPeU/ZDnzzK84dRtZb/vh/FDA8KpG5 qU5A== X-Gm-Message-State: AKwxytc3O229YMAUmdT6EOziLQYWHOmlmYWFA6SefyLfc4p8kT0tPs1e isuqDowUEdfmtgUPscEVMc5yKw== X-Received: by 10.55.198.202 with SMTP id s71mr5467474qkl.310.1515185474783; Fri, 05 Jan 2018 12:51:14 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id v58sm4122120qtk.18.2018.01.05.12.51.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jan 2018 12:51:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jan 2018 17:50:54 -0300 Message-Id: <20180105205055.4120-1-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter: deprecate avfilter_link_get_channels() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" And move the channels field to the public section of the struct. Signed-off-by: James Almer --- doc/APIchanges | 4 ++++ libavfilter/avfilter.c | 2 ++ libavfilter/avfilter.h | 15 ++++++++++----- libavfilter/version.h | 5 ++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 38c1be61c7..6e48c8707e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h + Deprecate avfilter_link_get_channels(), and make AVFilterLink->channels + public. + 2017-xx-xx - xxxxxxx - lavr 4.0.0 - avresample.h Deprecate the entire library. Merged years ago to provide compatibility with Libav, it remained unmaintained by the FFmpeg project and duplicated diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ff7df672fd..ea75467a75 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -183,10 +183,12 @@ void avfilter_link_free(AVFilterLink **link) av_freep(link); } +#if FF_API_FILTER_GET_SET int avfilter_link_get_channels(AVFilterLink *link) { return link->channels; } +#endif void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 47546c15e5..410d8bbdd7 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -448,6 +448,11 @@ struct AVFilterLink { */ AVRational time_base; + /** + * Number of channels. + */ + int channels; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavfilter and can be changed and @@ -551,11 +556,6 @@ struct AVFilterLink { */ int max_samples; - /** - * Number of channels. - */ - int channels; - /** * Link processing flags. */ @@ -647,10 +647,15 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, */ void avfilter_link_free(AVFilterLink **link); +#if FF_API_FILTER_GET_SET /** * Get the number of channels of a link. + * @deprecated This accessor used to be provided for ABI compatibility, and + * does not need to be used anymore. */ +attribute_deprecated int avfilter_link_get_channels(AVFilterLink *link); +#endif /** * Set the closed field of a link. diff --git a/libavfilter/version.h b/libavfilter/version.h index c07f4d30d9..0f11721822 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MINOR 11 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -55,5 +55,8 @@ #ifndef FF_API_LAVR_OPTS #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) #endif +#ifndef FF_API_FILTER_GET_SET +#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) +#endif #endif /* AVFILTER_VERSION_H */