From patchwork Mon Mar 6 02:46:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 2759 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp1219715vsf; Sun, 5 Mar 2017 18:53:31 -0800 (PST) X-Received: by 10.223.138.252 with SMTP id z57mr11731686wrz.110.1488768811314; Sun, 05 Mar 2017 18:53:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 43si3256708wry.114.2017.03.05.18.53.30; Sun, 05 Mar 2017 18:53:31 -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; 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 54D0368826A; Mon, 6 Mar 2017 04:53:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 624D768045B for ; Mon, 6 Mar 2017 04:53:09 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id z63so9369452wmg.2 for ; Sun, 05 Mar 2017 18:53:22 -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; bh=0B4RqmhGGO+H2sjV4ACCHqRtPF1PI9VZxL8Fvll2q2Q=; b=b2+tk1ZmGm/iy3fDIjGkiUIUbrMDqvux/GEW6tQoHVgc5eesxbxZIup18TnMFEy40f 5LWKkV2Xn3mmHjC3TUnqFNla0wqWMDCrmXN30Y7buJz4K9z6MgF2+JljU6eWRTFpk5NK iEX1KyjcnOqbcsjaQtyy+roT/YIupG4BALsIfh7uYrp+8aJ0dAkmNm/CIAByXDJygBBI E2JbzUnhTcizHSB3zMEo26zbMhFfm+fQBLTKwXM+dFMDFSkoZpFZXPmx+0k5EXqQ4/jb 9SGkc9t+WLF10pruL/rJzWewv8lSbLHo+RpDf3zquyMEEDt51zRkWd8wZAk9eWfj7XqW 951w== 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; bh=0B4RqmhGGO+H2sjV4ACCHqRtPF1PI9VZxL8Fvll2q2Q=; b=sKUKokXlNbqUJxg5xdzG+/kw4VAQ+aHiM/vFZmk2XccemJXdk7sbF5u5N460phDccq f0sNwOikccO31/7stkQs4tHZ0FDIEU4trLLEdhT9bSy1PbXDz5VzNaRa0mdBL24tuBew pLpP9cdblTuTUnO5Gax0nBemN+ZWO2aiZNj/h3/8mYPdLwYqYgGNV0CZhpRud3IDLZk1 Wn6xR2HYwULnjy8l6rluf8ZdomMDWM7BxKcoV/N0thBpNLKmo0ORUAGTaU7MaSQ2yzgn 21FHytAJkI4v2bTcN3galSYGQ8Yd4f8+p4zYhw6XGlKiGiNroB0T4ZDddUJk47M7EAVg yAtw== X-Gm-Message-State: AMke39kdLZMwdBuaLO02UrvTbS0/nGnDXwsBZcSDCfd1zSz0K91nxJ/EoHSqarS2kjab3g== X-Received: by 10.28.196.142 with SMTP id u136mr10777407wmf.93.1488768416451; Sun, 05 Mar 2017 18:46:56 -0800 (PST) Received: from moonbase.lan (host86-146-196-130.range86-146.btcentralplus.com. [86.146.196.130]) by smtp.gmail.com with ESMTPSA id c58sm25150104wrc.9.2017.03.05.18.46.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Mar 2017 18:46:55 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2017 02:46:50 +0000 Message-Id: <20170306024651.66336-3-atomnuker@gmail.com> X-Mailer: git-send-email 2.12.0.rc1.440.g5b76565f74 In-Reply-To: <20170306024651.66336-1-atomnuker@gmail.com> References: <20170306024651.66336-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavfi: deprecate AVFilterGraph->resample_lavr_opts 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Not used by anything at all since we don't auto insert lavr filters. Signed-off-by: Rostislav Pehlivanov --- doc/APIchanges | 4 ++++ libavfilter/avfilter.h | 4 +++- libavfilter/avfiltergraph.c | 2 ++ libavfilter/version.h | 5 ++++- libavformat/version.h | 1 - 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 6922ea5268..2275f0da4b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-03-02 - xxxxxxx - lavfi 6.75.100 - avfilter.h + Deprecate AVFilterGraph.resample_lavr_opts + Its never been used by avfilter and never given to anything + 2017-03-02 - xxxxxxx - lavc 57.81.104 - videotoolbox.h AVVideotoolboxContext.cv_pix_fmt_type can now be set to 0 to output the native decoder format. (The default value is not changed.) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b56615c98e..ac6dca4fc0 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -841,7 +841,9 @@ typedef struct AVFilterGraph { unsigned nb_filters; char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters - char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters +#if FF_API_LAVR_OPTS + attribute_deprecated char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters +#endif /** * Type of multithreading allowed for filters in this graph. A combination diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 534c6701a8..75bd516896 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -128,7 +128,9 @@ void avfilter_graph_free(AVFilterGraph **graph) av_freep(&(*graph)->scale_sws_opts); av_freep(&(*graph)->aresample_swr_opts); +#if FF_API_LAVR_OPTS av_freep(&(*graph)->resample_lavr_opts); +#endif av_freep(&(*graph)->filters); av_freep(&(*graph)->internal); av_freep(graph); diff --git a/libavfilter/version.h b/libavfilter/version.h index 11db8d5513..3cd6e24b27 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 74 +#define LIBAVFILTER_VERSION_MINOR 75 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -67,5 +67,8 @@ #ifndef FF_API_NOCONST_GET_NAME #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #endif +#ifndef FF_API_LAVR_OPTS +#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 7) +#endif #endif /* AVFILTER_VERSION_H */ diff --git a/libavformat/version.h b/libavformat/version.h index cd505242ef..4a12d7d947 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -89,7 +89,6 @@ #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58) #endif - #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 #endif