From patchwork Fri Mar 11 12:18:26 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: 34689 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1638382nkb; Fri, 11 Mar 2022 04:19:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4VsoVfmsY2cSRwNMqRZ3qEW/xmwXZLGxIvixhX2TJi1FcJUMjFEIyBXguV4UWxV7LDJIF X-Received: by 2002:a17:906:2bd7:b0:6ce:698b:7531 with SMTP id n23-20020a1709062bd700b006ce698b7531mr7940770ejg.146.1647001165287; Fri, 11 Mar 2022 04:19:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647001165; cv=none; d=google.com; s=arc-20160816; b=O0zXnYfOBJ1JFymc4PPeXrggJMwQCFcgjBkjRNF/RAzOBbKatt4Nmr5vYph795zsWj KKCEcTzNBJuCBDf2S3JZeqXjDiYM9vjL3JYSaJ97kKgJ7/C6iZk/eBcBSkUBlijHg6qJ T43SdiKC2Iy388HCizBv6mnvDDhKkeYe0oJ6HmbWvB75mI7Pc/W39e1CpGopUrOZ3nGZ 8HpM660qd3CNZxIHHfWutaHlmXhpT+Z+2Lv0e4oB3RjSnujrLEGlJ74oBq+9Ng4qXXqq CbhKKfQSTQmvYe6VocW4KlBYL5DfFwuLl4Xa3YL/D6REVK2et0aHuc80MNR3wOR5/LJj C8vQ== 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=UL32itGZqvuodcn+qwsXG6ElLhwXkN+4mrfzXsNeKHQ=; b=gBNVls2jeSRLIQwnFBt03MzMEbMuNZWSEoUawJXsBxEQS6OUB7wTBq0wKOhsHmKFG/ Ljiio49OqIx+R0BiGTiXEbcVJDD6lwLmC19d6JsHGptUzlh8Xbod+mJ2sDOK7M7Ya32D JyIe/DJeUuprBxBnW4ZkY0ngIkGqsAVLVEuGgyKZn98syuOYdKt8qMxn+ygwv4IED2i9 hftAprG7qyK0ZCoVaA9JUyQ6yjFugTENKqjxKOTusjr1muMpvY49lxz4VlGbYmW+ywz2 JmA7ZgzUBr+cvHDNIU4tYgccqe9YKJfpQAiNdDcdrnOu/JCj3DuMha5ANABHPjT/FZb3 hJMA== 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=3OP0IVfr; 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 i15-20020a17090639cf00b006b334fffde0si4542414eje.588.2022.03.11.04.19.24; Fri, 11 Mar 2022 04:19:25 -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=3OP0IVfr; 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 8965168B1F4; Fri, 11 Mar 2022 14:18:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E427368B1A3 for ; Fri, 11 Mar 2022 14:18:35 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id 3so14721820lfr.7 for ; Fri, 11 Mar 2022 04:18:35 -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=36PElFfX9Q7M4r8I1YqSNSEohIHcq9Hdfm/xJuUmFSY=; b=3OP0IVfr30YgnMNWRQa2dCCEgpYQHka3mS5+mHB2k5/o9TsFBE8+tIYsCRukSyPoql bb1w3W0nwZBRsf/tqde/bc2u0dLDHcMjpbkIwuJcBBo9fp+USK7inRlnfCMuHLRsua6e e4vb9Py8zlG2p+8/waEWYdMG4V/Kd0gkdNYJmOy+jB62dFES95nItpsvOnQEGrUf2MEl djajCtX7lZ6BtW+Eh85L1+bl127hhNxms5Q3IdzfaAAokM99M/FPJ0wYr4fXp8P0Gyns A4/B1Sd5pr7NzIdCoFH1nIQ6Zjq5kyBBSCmvccgzO+nqeo3ePs1UwyBT7e4IQaSwq3Y5 D4ug== 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=36PElFfX9Q7M4r8I1YqSNSEohIHcq9Hdfm/xJuUmFSY=; b=mFyqbqyFNyYCOfmC2V2WcFH5gkx1h46ysn57eD8zBdRBiM//s7Wz+RD4uVv2+D6ekl ZgsFzjJTz06FIV8/y0jpp1JonDKvwzB/G7XwDa3MDeQ1flgETpWIS4RNCOfU7Pm4xD2r ufJ8BTa0ekmClz4l3A5c1DnmnBxLTDg5qHol7hrKjh2niMP824fNM7OrHyqRsBTUcusy M9BVvc/7QgxHgaYsNqcEfWLGSDqqMNdEusut1+ojsec+4l4UZ0MIg1/D9LTSvIkZzU3u umyXgIbl298YTixWybMwof4BD8MKFWzc5dpC02SQRVNQXSgdJeTDrik3zrFoD3Kuintw 5Q1Q== X-Gm-Message-State: AOAM533lhVWSEYvY/qV9UgmoUQW82exTZphBtT7tfz6vk+CvjqASACO/ O35nIQs0FUdrSsZq5v7VUX+xO9Ucv2QdVo6h X-Received: by 2002:a19:6d0b:0:b0:448:5b24:c198 with SMTP id i11-20020a196d0b000000b004485b24c198mr5811094lfc.132.1647001115145; 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 t2-20020a2e2d02000000b00244dc8ba5absm1707480ljt.117.2022.03.11.04.18.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 Mar 2022 04:18:34 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 14:18:26 +0200 Message-Id: <20220311121830.5653-5-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 5/9] 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: cTutaw+j9493 --- 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 203f062935..7d8ab0392e 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -56,6 +56,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 */