From patchwork Mon Apr 19 14:09:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp561555iob; Mon, 19 Apr 2021 07:18:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbkuwSYe7H3aE0Q+K1ipXwvOhrdoR1BaTVVYoBVjx8HoB+EKZeBfgJ0fi4pWY5mJ3n3Nsd X-Received: by 2002:a17:906:3190:: with SMTP id 16mr22614590ejy.355.1618841915485; Mon, 19 Apr 2021 07:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841915; cv=none; d=google.com; s=arc-20160816; b=d7GIdbrEQituajKvcOwspGQaC/EowAwEDs89c6gn7Vuj4x0XMxq32rl0fZ9l0B6hmG gKVGEYxZ/d2LL7W6NBHvwJtEdJfGZ7C3afXrqR4sOY4G+tO6H+11nhWQwINVTB3UUPwt Md1hFLzcjMHInUpnjtkKQMGN26xstaUzbSju6g7Tuce/ISznJ+OEKP/FQcNFGVzgTx0j R5igRzGaHU8669FhH0Phzkjb7nxL4WCjcJyKR6Mh1aO087bQxt5uwlXQQWFF+fsDIZBc 6x/ijHeOZT9nGOklomVnQbo5WhatgLnb7oLj+HTb+h+5SDzeN19Idu72FVZ5yzjJv487 9GpQ== 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=EvXZW54FWYz6N2XCEFOKUYZQXhNtJLZ/uXtrufm+q2o=; b=CQJXm1sEsTc68j3uckFXwMdQOGwESbFusVSbXu7tFytEkUgZTJ2BmU6DN5DyfvJ7BF 6Z/uAVSqA8Jfo5oeYhaCD4RWGTfR6U0HWC24ZG3m6WxYUa8CI2yiUm0vFja8vzc0KvOW akd7WM0aoUAVme1zJ66X2r4KS74SJUMz6lCSAFUoAMpBXW06TN5bD118y8unZnLfoOlg fcY29tfMZi6N9qcmuNfI6HFZ8RiOsKwpwpLUGY8Scbct9nQ3JtnYtghB8uOTNH5m3HBu o440fEH+NmPNZrJ0Z208q0QeXMseJXlj5UpBB03vMTK7v7rbHthdtBF45/4lBTAutuVD Qe1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uKuPY63P; 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 ia20si11928654ejc.108.2021.04.19.07.18.35; Mon, 19 Apr 2021 07:18:35 -0700 (PDT) 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=uKuPY63P; 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 076E16899E4; Mon, 19 Apr 2021 17:12:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 580FC689902 for ; Mon, 19 Apr 2021 17:12:04 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id h13so17167647qka.2 for ; Mon, 19 Apr 2021 07:12:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=OMWwqrOJwFjgBg6ExApkq2o1YiuIekXvw2DUOtI374U=; b=uKuPY63POJFg8RTMY8aC1zeDws9UvdIZBO4pCW60kqnDd0jO9ar++pvvpShwQIibpQ Ut7YKkufaCxxQSfIjIJpR1s1XLRH7SIHj7YV5+A/IKDaGwEhvWV3WLy7DANb3s+hrjl+ itNG7sA8KwrE9UgLUg3cafcb/5HpF+zBZ4amgWuN6Bkl9hds0z3Q2dMqS9KXXSUbXwAk DB2bxsr9TC8sXYmzCwMU6sDOCuB0fpo/RdaxIs5rDX2Mb5PA7oHHCMTWlPmQmoP25YPm hyPQRM/4TIsAebcbqckdo7CvPJknkHszGkn1Ba+2PtoaLNOzBiYFclcjh5GhGLqgEAOl 941w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=OMWwqrOJwFjgBg6ExApkq2o1YiuIekXvw2DUOtI374U=; b=Rw01Z0PZlFO+g7y4pzc1g8aU35vfUDQN6Se5qK9gMaisbh2TFP2GwgQ/2mwDu3l1lZ ayUlkr4HqJig5E6Jfz5JmxQcqYvnkaSBSr9pog5NXGyjpMPVXUf3yZ7Pn4kr4x9+4jYq aq6N7LxPR+UnEQ+ZtBjqzZ6jD+J4qjxaqy6rp4dXG0cAu1T0Mx+qgpIaZyvO8muwBVxA hnr1v7vrOURPnpN5MegYGodwrZP2/9GVy9Z4yB7QkdGXgPQFoh6Z0eyT82sjaijf6QmF MhAJWLNJ0TFnJntgidKwd8cQFzQnGqBqmASjmS9jVJXlr9ZXxvIOV338PLXvsJIsRKsv 90fw== X-Gm-Message-State: AOAM532asMDZAYx8fglbK6ihTuwM8CNOPvvzTUAqWylJ3lU1RRq6NW0+ bjs4jx27csfxlZgZ67hWTPqQ8HpkddA= X-Received: by 2002:a37:a68c:: with SMTP id p134mr8428213qke.451.1618841523049; Mon, 19 Apr 2021 07:12:03 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.12.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:12:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:48 -0300 Message-Id: <20210419141024.8174-52-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 51/87] avfilter: Remove deprecated resample_lavr_opts 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: q754p3f/AAgY From: Andreas Rheinhardt Deprecated in 3796fb2692f87d0000fc0aa4572ac025a6469c2b. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.h | 3 --- libavfilter/avfiltergraph.c | 3 --- libavfilter/version.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index be1242436b..b5e092f8bc 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -853,9 +853,6 @@ typedef struct AVFilterGraph { unsigned nb_filters; char *scale_sws_opts; ///< sws options to use for the auto-inserted scale 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 f6b572b3de..ed54d3dc11 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -131,9 +131,6 @@ 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 fd38252411..ba9ff5f633 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,9 +50,6 @@ * the public API and may change, break or disappear at any time. */ -#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