From patchwork Wed Feb 23 14:29:47 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: 34481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp891316nkx; Wed, 23 Feb 2022 06:31:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhNusohbw28SB2JEeCF96HJTMuAtcXjHWgfErbl6TqdmCWa8tUDR9eroK944nQMylvUejQ X-Received: by 2002:a17:907:9196:b0:69f:2625:3f2e with SMTP id bp22-20020a170907919600b0069f26253f2emr23128473ejb.575.1645626696206; Wed, 23 Feb 2022 06:31:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645626696; cv=none; d=google.com; s=arc-20160816; b=v5XDvfbo9plZ9a+8uA2gG0FLxsX9LrXtilQIFUAUl0zoDLT7eoI/q66++8033JLHrP pK39ZxLOYOH+isZKhbahKg808V75cARcoO52do1+8FXpyRBUIuVy8RMJc61gVA0I4PfB cIHqI2QEdCIA0DAgjAgx0g1FktTM8DVAr5cxnRzSeo/Z3qGGu3Qf/u1gKkpQsGh2sDvJ 3YwdcZwzj1Zg2YvBU24eVS2EcmM+AqmGgZH8NCMEDhXSGeNmNs/BQhFMgwWGcTOly5dK z4HZt2FDQ8RAHlgmr9tFUTNI8rSX4irou2X9foiyWYEvWm68FeHYQ7rmJm7dWOIIbGia tqlA== 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=VjXVupBab98Ec1ZdMfIiVp/Rg5FqVWLomOKeHvv4XOE=; b=fhgHBBnm3sijK02oPHKSsxiMm87pmUGkWlxLjyt7X8A2LwqgzxgsZ3Mf4NPFBs3UpX uItfWis0k62R2rAUiF//SVOthCSyAl0no4lUG6YUk7hhdsAj4/6cH6qsItV39ajFBiU/ qoRYb4VE+UQqTgg9HdB6XawkopDFYDL3ocFKpzkCnNU99E9t7F1WDUOK7FZA3/5iXpvW 29P5f7tebxTHuSK7EUycOx/el2bQPsViAmS/nQJUwiAYMZZSnliD//MIlB6KNn5UBG39 f/cjL/hqyQblJwJfcTkZPVuj1FJIOd+anQ//HwLGLy01KlO27B7JYvlLt1FdSe3VrwSz l89Q== 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=Jgit4F82; 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 by10si14916478edb.621.2022.02.23.06.31.31; Wed, 23 Feb 2022 06:31:36 -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=Jgit4F82; 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 50CCF68B2B0; Wed, 23 Feb 2022 16:30:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A8A668B290 for ; Wed, 23 Feb 2022 16:30:05 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id u1so39917186wrg.11 for ; Wed, 23 Feb 2022 06:30:05 -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=8IJ+AC3NGF79AM+J1xdA/lzV/e/KAD0JhPDTKmEbbuk=; b=Jgit4F82ILQVj+TQ3Q3/jsXGbh86JCInMD2lOJ+Nh3Ed7u/1eNySlOJzPLD3w+m8Sb YOsADOXkDMBYnvv6KMOIhWEkqYUj9BfpSzwoAjAXqNxRVXu+M0HncA6LGjtdE8XbOuq1 TbsJwoeLFwXoqhGjOOC6gV342sFU48baUV/d7/p/X5y3B1M/Ay2mmrr8jB/b6mbiyNb4 bvBBFt70x/VepuZLnISc6GWZ200hkQmRqg63ZjtCyuga8AJHShmR3Nnv/aPfSOKE89iA iz89ML9Lq9EfkRKbgogK6+zdwBAOVzQBjp0wb+wlLywRM/GOTKgNmcmix37fM2MRVy/2 ns/g== 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=8IJ+AC3NGF79AM+J1xdA/lzV/e/KAD0JhPDTKmEbbuk=; b=13be5CLjzx/0sgjF55Xna2SNpdyPqhnNSK5Lf9/19Tst9g1ebga5opfIXqkA8ho6m/ v15dx1yQ8R8snJ2EfHyFxgktt1DCmC8mYgxyXuNFWDYeHTcmpZ/wYn6VeDqNVqg5g1pN /QefFvKPhJRboBZ43/5DstFTOkqa/VqcmU6zbmyGGMu/JWDBqDfaYaZzsnuITc9b9OLn UdvpY2M58J5Sd5SGPGsHJOajITH2NgxVbtP8RLkxr6iNM5+0RxBHE+gNqyDQ389l0/pK IjEgyexRDr9OGdQaxtlotta1YWGFkDcq/6Y2odsojGDz7R/zPTy6o2yTe7A/AOvM6pnr labA== X-Gm-Message-State: AOAM532rPzAkXZzIn/BeHk78qcH9CiKBFBnaEMeUYMvBNOiw6RPSvZG9 jwb5EyTCE8uiTXzyFxsPcOafbog90jCQ/wEf X-Received: by 2002:a05:6000:2a2:b0:1e8:6dd5:767b with SMTP id l2-20020a05600002a200b001e86dd5767bmr22849455wry.444.1645626604688; Wed, 23 Feb 2022 06:30:04 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id g6-20020a05600c4ec600b0037bf934bca3sm6937416wmq.17.2022.02.23.06.30.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 06:30:04 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 16:29:47 +0200 Message-Id: <20220223142951.40366-10-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 09/13] libswresample: 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: y5y6BEfYkCuS --- fftools/cmdutils.c | 1 + fftools/ffprobe.c | 1 + libswresample/Makefile | 1 + libswresample/swresample.c | 1 + libswresample/swresample.h | 2 +- libswresample/version.h | 3 ++- libswresample/version_major.h | 31 +++++++++++++++++++++++++++++++ 7 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 libswresample/version_major.h diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f52015708c..dd5d4f5849 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -38,6 +38,7 @@ #include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" +#include "libswresample/version.h" #include "libpostproc/postprocess.h" #include "libpostproc/version.h" #include "libavutil/attributes.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a0b9854004..9f04354c7e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -55,6 +55,7 @@ #include "libavdevice/version.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" +#include "libswresample/version.h" #include "libpostproc/postprocess.h" #include "libpostproc/version.h" #include "cmdutils.h" diff --git a/libswresample/Makefile b/libswresample/Makefile index f528427f55..b74ee20987 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -4,6 +4,7 @@ FFLIBS = avutil HEADERS = swresample.h \ version.h \ + version_major.h \ OBJS = audioconvert.o \ dither.o \ diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 16734c9df9..82e979c4c9 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -24,6 +24,7 @@ #include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/internal.h" +#include "version.h" #include diff --git a/libswresample/swresample.h b/libswresample/swresample.h index c7b84fbcac..aebdbafcfc 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -124,7 +124,7 @@ #include "libavutil/frame.h" #include "libavutil/samplefmt.h" -#include "libswresample/version.h" +#include "libswresample/version_major.h" /** * @name Option constants diff --git a/libswresample/version.h b/libswresample/version.h index 61d0057cf5..9a514e6d6f 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -28,7 +28,8 @@ #include "libavutil/version.h" -#define LIBSWRESAMPLE_VERSION_MAJOR 4 +#include "version_major.h" + #define LIBSWRESAMPLE_VERSION_MINOR 4 #define LIBSWRESAMPLE_VERSION_MICRO 100 diff --git a/libswresample/version_major.h b/libswresample/version_major.h new file mode 100644 index 0000000000..7f265c2073 --- /dev/null +++ b/libswresample/version_major.h @@ -0,0 +1,31 @@ +/* + * Version macros. + * + * This file is part of libswresample + * + * libswresample 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. + * + * libswresample 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 libswresample; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SWRESAMPLE_VERSION_MAJOR_H +#define SWRESAMPLE_VERSION_MAJOR_H + +/** + * @file + * Libswresample version macros + */ + +#define LIBSWRESAMPLE_VERSION_MAJOR 4 + +#endif /* SWRESAMPLE_VERSION_MAJOR_H */