From patchwork Wed Feb 23 14:29:48 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: 34482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891505nkx; Wed, 23 Feb 2022 06:31:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsE9RsZO/XWvVVLGvhlQ91R2ZcC8+BUbHNVb16uH8HeI7LVsc+0XCP75/iVtsasiq1OjhD X-Received: by 2002:a17:906:1ccb:b0:6b9:f52:5c60 with SMTP id i11-20020a1709061ccb00b006b90f525c60mr23025579ejh.509.1645626709085; Wed, 23 Feb 2022 06:31:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626709; cv=none; d=google.com; s=arc-20160816; b=RRw0VUp+yi4McQ0z6QkWH3D2iuMeA1q5lzo7Uvx+iq61+AWMHD3SIyQpf29/+BucKu s/JKyKcb2N9feWimD0jVik3lsO0voh8O8++nC4ipCTsjPao3UyPYZFyW9WGf2W7sLP/t sOKT/0u+wQfZstpF+ppj+T2EgzqbIFacDpL7BwIry/5hCmt62Bv4pE8DXAIWClkFJqOh R+EoBKhXlUWXytmBtBpk2/8setJkai6HwBJ75UjEP4JowXQ5KmWHAA/753nAQPu60F8U M+sRsDA8hUFTsePqIblUj6sNYqIqne9pR3N6adRVmzo0RtM6p0kTdJpG8yOiv4WYyZ2V buAg== 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=PI9rjMMvEm3iJPTYtDOBFaOMpk2zapYTDd/gh9WyTGw=; b=XzidUk9mZV8YfXGv8mfQrI78DlYibeRd8LNFIBb1+Fyl04eUzVx+4ptErSHZpIHumY 7qOWlMq8boYEpfuEmc5mhCuzaiGKzJpkEKN+3vuUOqzO1cijLHSamO2l7eCPJgRKQ7eu 2cpZg4uOs7nbV3UWl8N7dAzUayCpfHn4nM1BVAYnhN9CYrKdnASba5LgGQNkJmNY8dVQ 547e/tTtMLVOTqDIKhYPU/AUvU47fZwibf2L7S+sJQCI+JI7bg9yb853PMbzZZnLT5jT mCYTtCXEtrW46YO2NziCQwApIAPspIyz+fuhj01wAFaTvVAJa0B9xqqZJcFhCxq6O90H z8/g== 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=lsw9mi3c; 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 c2si9423490ejz.640.2022.02.23.06.31.42; Wed, 23 Feb 2022 06:31:49 -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=lsw9mi3c; 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 5003E68B2C6; Wed, 23 Feb 2022 16:30:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBDCF68B295 for ; Wed, 23 Feb 2022 16:30:06 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id p9so39928347wra.12 for ; Wed, 23 Feb 2022 06:30:06 -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=FqEOmoV6HCI4H3pHuV308uy9XEcBeRpQfEeBOIXpeZA=; b=lsw9mi3cY6xPtaxjpI8GMjfmozfRfslB+WrJJVJvPAB8SuSnLhWvEdem6pSTSmxTmi CWcYQ1U6FrsWKG0odVoGU6QAwQ0purE5w7CkTRttNoODTRnDI3CJmtGichAfbefK66LH aTO22PYpoFdu5jUnauAd9/6vkac8+Erfv5PeXGzSb31aKWLk6086f96RDmb/ul1KLOGs rQkCtdv4OPbuaCDsalMRjNmYGJKdRFCbm/uvADWr13cKsECrknmUuRl+eRuNysuJLppr 1klefzicZgb9lc+cGRT3OjN+I8ohTT2SWQv3ceEjqcXTj6CuQ1XpXK31/YEfYPV/Ph0l OAkA== 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=FqEOmoV6HCI4H3pHuV308uy9XEcBeRpQfEeBOIXpeZA=; b=G30xNU7XwAmKP6RTGaoH9LPWkuhRvPTvPUK28LjCWNd2FrRN/jXDsLRkvOgt9U5z9Z 82Bi4HoG8uq85qFyZ3yApr/4Yk8mXEjW5d95Um5yStP9CG+Gyo3WGjOo8QdJHN+O5nVx bBd+MUH/iYLvvc7A/ZcfEVBqVpL4+HvDAq1fBHh+plH1ubhcpUqBO+ZykG8oe4hmQ2+q tx4/8ppCts2l2i4smx8UC0dFXoHwKjwAmX5hQpE29VXabQ2hcRAGmbqgJWbAJqxylTSz xMkWcSSVVeMmhm0Y8szSONwSnkuW8gbW5ONKYBOHJZJZz+FGeG3eVW36WhLs6o5oUCoZ vOIg== X-Gm-Message-State: AOAM5320waDJHOAjAZ/d5rBz/J/3ePuAhWW6Y+Gz92sBsSASC/NQg5IA RLFgnUAntX1G3xkDa9jkBzTZ3J3DedhzIFQg X-Received: by 2002:adf:e344:0:b0:1ed:9ce7:2d33 with SMTP id n4-20020adfe344000000b001ed9ce72d33mr4396719wrj.289.1645626606279; Wed, 23 Feb 2022 06:30:06 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id z17sm6216792wrn.55.2022.02.23.06.30.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:05 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:48 +0200 Message-Id: <20220223142951.40366-11-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220223142951.40366-1-martin@martin.st> References: <20220223142951.40366-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/13] libswscale: 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: wse7sgvVKlSe --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libswscale/Makefile | 1 + libswscale/swscale.h | 2 +- libswscale/swscale_internal.h | 1 - libswscale/utils.c | 1 + libswscale/version.h | 9 ++------- libswscale/version_major.h | 35 +++++++++++++++++++++++++++++++++++ 8 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 libswscale/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index dd5d4f5849..d5cadec695 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -37,6 +37,7 @@ #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" +#include "libswscale/version.h" #include "libswresample/swresample.h" #include "libswresample/version.h" #include "libpostproc/postprocess.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 9f04354c7e..2e74580ca8 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -54,6 +54,7 @@ #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" +#include "libswscale/version.h" #include "libswresample/swresample.h" #include "libswresample/version.h" #include "libpostproc/postprocess.h" diff --git a/libswscale/Makefile b/libswscale/Makefile index a0ec71e06f..1f02b56421 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -3,6 +3,7 @@ DESC = FFmpeg image rescaling library HEADERS = swscale.h \ version.h \ + version_major.h \ OBJS = alphablend.o \ hscale.o \ diff --git a/libswscale/swscale.h b/libswscale/swscale.h index daa53dc01e..07c69e1ae7 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -33,7 +33,7 @@ #include "libavutil/frame.h" #include "libavutil/log.h" #include "libavutil/pixfmt.h" -#include "version.h" +#include "version_major.h" /** * @defgroup libsws libswscale diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 26d28d42e6..3cf96d5fbc 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -24,7 +24,6 @@ #include #include "config.h" -#include "version.h" #include "libavutil/avassert.h" #include "libavutil/avutil.h" diff --git a/libswscale/utils.c b/libswscale/utils.c index 7c8e1bbdde..ee8e5c9364 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -59,6 +59,7 @@ #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" +#include "version.h" static SwsVector *sws_getIdentityVec(void); static void sws_addVec(SwsVector *a, SwsVector *b); diff --git a/libswscale/version.h b/libswscale/version.h index 0e5583aa47..c13db31c43 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -26,7 +26,8 @@ #include "libavutil/version.h" -#define LIBSWSCALE_VERSION_MAJOR 6 +#include "version_major.h" + #define LIBSWSCALE_VERSION_MINOR 5 #define LIBSWSCALE_VERSION_MICRO 100 @@ -40,10 +41,4 @@ #define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_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. - */ - #endif /* SWSCALE_VERSION_H */ diff --git a/libswscale/version_major.h b/libswscale/version_major.h new file mode 100644 index 0000000000..2f8418780c --- /dev/null +++ b/libswscale/version_major.h @@ -0,0 +1,35 @@ +/* + * 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 SWSCALE_VERSION_MAJOR_H +#define SWSCALE_VERSION_MAJOR_H + +/** + * @file + * swscale version macros + */ + +#define LIBSWSCALE_VERSION_MAJOR 6 + +/** + * 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. + */ + +#endif /* SWSCALE_VERSION_MAJOR_H */