From patchwork Fri Mar 11 12:18:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638577nkb; Fri, 11 Mar 2022 04:19:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+9idZpyAtQ1x4QUXwMoraSqaYFITnL3cdj6SQQdnvk8X6TTq9Dku44lAfjzio3YYz5Y+O X-Received: by 2002:a05:6402:2550:b0:416:997f:1239 with SMTP id l16-20020a056402255000b00416997f1239mr8687291edb.141.1647001185824; Fri, 11 Mar 2022 04:19:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001185; cv=none; d=google.com; s=arc-20160816; b=H3cDWECDHEBD4Lbg2hbJZSABs6K1JRJUFBwWHFxLsGjSOqNP9DaRTMeGoPhSh+AFy+ UdxttYAS8XTDwQoPhVgadvNVSjhHbHXwYWiYQz0fgtZmb29skXfG5H0ALoiMQtUZOK/F cLPGTaNEdqWNfNzlJw66KBZ0F305LelOmxf+7MC+l7XXZQ42eghmIE41q4rcQKBWOW5e Qtp0NTV/eGTxZGof2H7gvXKtFBD1VsFreIAHO0uD9viNHLZjfOpeI3Ttfu+us37xYgS9 pXQC+gfTAGJDlngT+pOqd3xb9LuFxo8+dpE1e3EBAqg2Po2g1lRNccPA3UetdsITZN5E k+Dw== 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=z0KwQWdKh/LtuiERByd/d7wlxRhcdiVcSW/PhI2SsqY=; b=FdI7bTlWyQlOPi+snKQN225ZfH1moQ51k8LJ3VeBYs7HZYJHEphtmnQDD3mBlZi4B0 D2TpeKlAVjvP1hq28wNbKwdTQhQF9wGCQksm8josoRwkai15pdLRyVYpFQT9hAQIAeB4 krHph9RmzmuLQOgiwLkU+y19RD0xBI+x7drPIsUVhznzQZq7DKsE7S/0aAJBa2mVLvWI TIVLNABtKxJg8fGa8/xKZqxPnAHAg/11AX0X83RbhGP9E+PTe8RECDrRijLbEsjecOdO fzGagjLoJ76+ctNCyd5iVpsW2U0/zkr8edoVJbAD1vvvr45PnVI5jF8npadgRBRPbpxw 8JWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="Xl7/eAMj"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gs42-20020a1709072d2a00b006db29be3d32si5340966ejc.38.2022.03.11.04.19.45; Fri, 11 Mar 2022 04:19:45 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="Xl7/eAMj"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B48568B1F1; Fri, 11 Mar 2022 14:18:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E5968B1DF for ; Fri, 11 Mar 2022 14:18:37 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id 3so14721938lfr.7 for ; Fri, 11 Mar 2022 04:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xGxCz9HpOQbRd1VjLTkAKPBXxBGy8lSsL15hlcwEoAk=; b=Xl7/eAMjczx70gJgBRuCxrFlI5Z35nlBSw5zgL6WvImzDNo5Guqw42FRT4rAdOjuwX 3HgWm1t26gQcftiwpAyq11r9hdI8euyC0Cd4dMlrNWjlqCVaQPOBN6j/FZX5GkhjDtD0 Tpt343OV1iRFX4oX8YAKcDsL41fsMB9hmrwNZRCrlymNSffcfG++UN6iFMlD2FL+G2Lb oPCTnWhk1XKmmYX5m3cVUyY9x0G3zC5FQTGmuCd9gBXjyRqs4NFaazI+TisFaTkHvlTA 8qJkMWdWuLMFksIkh0GRjNvEnb8TegyXAIfIPSLfEkcwq5KzH7W6MkuQ0+lpH2MnZA2A vyeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xGxCz9HpOQbRd1VjLTkAKPBXxBGy8lSsL15hlcwEoAk=; b=FMszuFHFl/zpZFiXxuu9cQvOlAYdCr6nJHVrtsHtPX/yhARsCdawGMn3q6JnAGdJeC aO78E7bqvV1gFPTpR/Fk+WLP9C44gefwsO+F1XHPz9hwAesPmYGyj0aUNPiJAVSoVhP6 aL/PZOcuu/xVnzSqoJtMOvqNx9abm0XzJH1+QIPuKzRzN6+jifsjjVIpKiR0u01UuqZo F1sxrSd1aliEkNmCOPpcez7rQAnOeA7gcRyuJe0GyFGDM5nedgXbx7kTV8Ntz8PKhiO0 1YQisZP6d6MbsgJsgbzUzYg55e6pOq67twyXtXl7i6a/jfYfmQUuihUxFV5VPndCFtkU r7wQ== X-Gm-Message-State: AOAM530kxP2e3gthK+u+SBQcUWC0kS5n2ukcrsVLNaqi/WCaaD1JIRKS 7h1NcmWtJQ3vJfsV3OzpJyfP6jYSg0Rx5fC8 X-Received: by 2002:ac2:41cf:0:b0:448:1eaa:296c with SMTP id d15-20020ac241cf000000b004481eaa296cmr5852472lfi.52.1647001116855; Fri, 11 Mar 2022 04:18:36 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id u2-20020ac24c22000000b004480054f52bsm1581148lfq.45.2022.03.11.04.18.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:36 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:28 +0200 Message-Id: <20220311121830.5653-7-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220311121830.5653-1-martin@martin.st> References: <20220311121830.5653-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 7/9] libavfilter: Split version.h 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: UHDbNpM8GKfQ --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libavfilter/Makefile | 1 + libavfilter/avfilter.c | 1 + libavfilter/avfilter.h | 2 +- libavfilter/version.h | 13 ++---------- libavfilter/version_major.h | 42 +++++++++++++++++++++++++++++++++++++ 7 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 libavfilter/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index d5cadec695..9cceb68412 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -34,6 +34,7 @@ #include "libavformat/avformat.h" #include "libavformat/version.h" #include "libavfilter/avfilter.h" +#include "libavfilter/version.h" #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index f36397a6ff..48c39d2540 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -60,6 +60,7 @@ #include "libswresample/version.h" #include "libpostproc/postprocess.h" #include "libpostproc/version.h" +#include "libavfilter/version.h" #include "cmdutils.h" #include "libavutil/thread.h" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 56d33e6480..d5fc27a575 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -5,6 +5,7 @@ HEADERS = avfilter.h \ buffersink.h \ buffersrc.h \ version.h \ + version_major.h \ OBJS = allfilters.o \ audio.o \ diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1f37a70179..859c5b837b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -43,6 +43,7 @@ #include "formats.h" #include "framepool.h" #include "internal.h" +#include "version.h" #include "libavutil/ffversion.h" const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b105dc3159..37effcf5cd 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -47,7 +47,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/rational.h" -#include "libavfilter/version.h" +#include "libavfilter/version_major.h" /** * Return the LIBAVFILTER_VERSION_INT constant. diff --git a/libavfilter/version.h b/libavfilter/version.h index 9a890c014f..40fa8d9c47 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,8 @@ #include "libavutil/version.h" -#define LIBAVFILTER_VERSION_MAJOR 8 +#include "version_major.h" + #define LIBAVFILTER_VERSION_MINOR 27 #define LIBAVFILTER_VERSION_MICRO 100 @@ -44,14 +45,4 @@ #define LIBAVFILTER_IDENT "Lavfi" AV_STRINGIFY(LIBAVFILTER_VERSION) -/** - * FF_API_* defines may be placed below to indicate public API that will be - * dropped at a future version bump. The defines themselves are not part of - * the public API and may change, break or disappear at any time. - */ - -#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9) -#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) -#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) - #endif /* AVFILTER_VERSION_H */ diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h new file mode 100644 index 0000000000..de0cf6e979 --- /dev/null +++ b/libavfilter/version_major.h @@ -0,0 +1,42 @@ +/* + * Version macros. + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_VERSION_MAJOR_H +#define AVFILTER_VERSION_MAJOR_H + +/** + * @file + * @ingroup lavfi + * Libavfilter version macros + */ + +#define LIBAVFILTER_VERSION_MAJOR 8 + +/** + * FF_API_* defines may be placed below to indicate public API that will be + * dropped at a future version bump. The defines themselves are not part of + * the public API and may change, break or disappear at any time. + */ + +#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 9) +#define FF_API_BUFFERSINK_ALLOC (LIBAVFILTER_VERSION_MAJOR < 9) +#define FF_API_PAD_COUNT (LIBAVFILTER_VERSION_MAJOR < 9) + +#endif /* AVFILTER_VERSION_MAJOR_H */