Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: "Martin Storsjö" <martin@martin.st>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v2 5/9] libswresample: Split version.h
Date: Fri, 11 Mar 2022 14:18:26 +0200
Message-ID: <20220311121830.5653-5-martin@martin.st> (raw)
In-Reply-To: <20220311121830.5653-1-martin@martin.st>

---
 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 <float.h>
 
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 */
-- 
2.32.0 (Apple Git-132)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2022-03-11 12:19 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-11 12:18 [FFmpeg-devel] [PATCH v2 1/9] libavcodec: " Martin Storsjö
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 2/9] libavformat: " Martin Storsjö
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 3/9] libavdevice: " Martin Storsjö
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 4/9] libpostproc: " Martin Storsjö
2022-03-11 12:18 ` Martin Storsjö [this message]
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 6/9] libswscale: " Martin Storsjö
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 7/9] libavfilter: " Martin Storsjö
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 8/9] doc: Add an entry to APIchanges about no longer implicitly including version.h Martin Storsjö
2022-03-11 12:18 ` [FFmpeg-devel] [PATCH v2 9/9] configure: Use a separate config_components.h header for $ALL_COMPONENTS Martin Storsjö
2022-03-11 13:53   ` [FFmpeg-devel] [PATCH v3 " Martin Storsjö
2022-03-17 16:29     ` Michael Niedermayer
2022-03-12 22:34 ` [FFmpeg-devel] [PATCH v2 1/9] libavcodec: Split version.h Martin Storsjö

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220311121830.5653-5-martin@martin.st \
    --to=martin@martin.st \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git