From patchwork Fri Mar 11 12:18:27 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: 34690 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638477nkb; Fri, 11 Mar 2022 04:19:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUiUlAHqaZUXs3TZ4zkY5ttTn/1WQA/jtIcgFn0Bv7huxqBDIuxtt5riTkj7nytJ+VORjw X-Received: by 2002:aa7:d648:0:b0:416:4b85:da68 with SMTP id v8-20020aa7d648000000b004164b85da68mr8329723edr.253.1647001175712; Fri, 11 Mar 2022 04:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001175; cv=none; d=google.com; s=arc-20160816; b=oQ+mwIF20tXDvaWbW+0iDXtY4d/yqjFBrnCiIEOPa73aG6SLxm0j95amw38sP0iwtE inBAo+U1kMAoAiyassVhnbV6W6SybOFhSe2PPHES2J8cMcSn3WYhdQvIHI/ccaRCEib7 567tK0xLV8sD4Dvi5fkt1QaoXDrHRtbm+JE5AJiz4VHaRWS1JX/UqkAeftk33b0in6mD +Wq3ZV9CZUXZ8dHhOfTEsWKhqM/LxnNmwt7rstSHsHHdBdzvBbrmbWXn5mnnyy89Y7ZO VmycAsTkdSW1LgaFkX31iJULiloRG/t9QUm3Rs8i3vFRUuWUoMwhKJipqr7dGzxn/Cze Je9Q== 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=RePquIBeDUCqu9cJv1Q8s13Q+vLq7AA0+bUf2FMo0Hk=; b=w3BKvuxRZjMoDfT5XhIqxiswFI1WUXuAJEQ8NnQ0UCp1ghN/gEO6GwIOlmyluwc3vN sbLvQrEs5sgMbSKPsWc1/9KuWnGtgDQLiUL6ojO1oE1f8qXXOihlbwN9jrjkgTH93StX eIIZT6iBP2PcG5JEAcqFRg5mCdzSY1NYovXpzk0ajESRftafogSN/YWOSkWpnIfm76Gc w+ZJqPMkfqYPkJYazKlZCs8OhjBPaSXIHmFXTlmge+Ysz7JCsC64LOJj7h7MMbXi/kg7 QEjH1OOvCUo+xR59nvEHGFTe9POGCbZyQH9G0uN28sRwB8YftmgoCN7Pzmo0jU0Z8xq2 D/qQ== 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=AiqJsdMA; 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 sb6-20020a1709076d8600b006da84362433si5751430ejc.843.2022.03.11.04.19.35; Fri, 11 Mar 2022 04:19:35 -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=AiqJsdMA; 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 5DC5C68B20E; Fri, 11 Mar 2022 14:18:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF05168B1DF for ; Fri, 11 Mar 2022 14:18:36 +0200 (EET) Received: by mail-lf1-f49.google.com with SMTP id z11so14661552lfh.13 for ; Fri, 11 Mar 2022 04:18:36 -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=RtI7BY7DHl2HQ6+5hSm9hssXWW8d3l5xF2o0EDzwYyk=; b=AiqJsdMAyBuRZX8C55lIJYIosVF1GhnxUs2lwI0rCKfCujjCNkt+tXXT4xpfRViWN2 mUOtfWXfXNWvg98rPcQ5JAuZcWS7wBxu8CrV4Q4xkV3X+5TDnTDXEVetXhkq6BoX3Ddj q1E+9xzg+4AcQx4YBs2jWIqXtCrxknfijjMHu5BJ2YwIHZ2XD+LSK8+Dub7UrVZADUiR YV9Az9NojI6uQhVhuK8xAVxzBdt0nrsHJJgZ76OwY84E5EhAaBgIN02oM/WUah61W4f2 +Koc4ilLoWaKMl5G6dubrr0cIgBulaGcSyTdj9sdZhvrPkIms4WQP50g4K15QbMO6kcu 08kg== 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=RtI7BY7DHl2HQ6+5hSm9hssXWW8d3l5xF2o0EDzwYyk=; b=yqbmA3wIkjVz170DrQY71Uana0BeVBu/KZhKXjAumrwm4c7I6P54l7TSWq+12UbsCr ph+lEfo52d4JZsrziJA3MAoiN5Ya+wNduzKA/nDlHA3Ger7jvEnQAJeBYDk0jBY52Rte ok0v4TkEV9hFTbcxKodbT7yEZcLmuo0QyOSJ+Kg2RhMp1v4XN5PY/3SHr1tRhNOgTS86 mDLPx9kcI7bPrKWBMgy07n7Zt9OclFqefOl2kV1c8QnT0JWqcdxrvI/Gu642pzf2SzjK rta2rxzIMjHJxwrJgE+bR32hN/uvkiYmfgsVGPjLMwGxdEkqXEM3Ilc1BjY8QsC9xxTJ jkLw== X-Gm-Message-State: AOAM530E/hCrgtuorKakBxE69C0w01GUP8zMPNWXjUOF+FCNmGS1Hvj2 XqkcFocdo2v7tsmKYOeac01ZKgBhHCQcBZxs X-Received: by 2002:a05:6512:2347:b0:448:309d:2b19 with SMTP id p7-20020a056512234700b00448309d2b19mr5863968lfu.222.1647001115966; Fri, 11 Mar 2022 04:18:35 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id j11-20020a056512108b00b004486eef2a63sm456141lfg.194.2022.03.11.04.18.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:35 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:27 +0200 Message-Id: <20220311121830.5653-6-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 6/9] 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: DPWj1rAhMvaL --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libswscale/Makefile | 1 + libswscale/swscale.h | 2 +- libswscale/utils.c | 1 + libswscale/version.h | 9 ++------- libswscale/version_major.h | 35 +++++++++++++++++++++++++++++++++++ 7 files changed, 42 insertions(+), 8 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 7d8ab0392e..f36397a6ff 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -55,6 +55,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/utils.c b/libswscale/utils.c index 34f7f0b869..e86c151f67 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 */