The macros are unused in several libraries and need not be exported.
---
libavcodec/internal.h | 6 ++++++
libavcodec/version.h | 9 +++++++--
libavformat/internal.h | 8 ++++++++
libavformat/version.h | 9 +++++++--
libavresample/version.h | 9 +++++++--
libavutil/avutil.h | 4 ++++
libavutil/version.h | 5 +++--
libswscale/version.h | 9 +++++++--
8 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index c4f0981..a901f6f 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -26,12 +26,18 @@
#include <stdint.h>
+#include "libavutil/avutil.h"
#include "libavutil/buffer.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixfmt.h"
#include "avcodec.h"
+#include "version.h"
#include "config.h"
+#if ! FF_API_AVCODEC_IDENT
+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+#endif /* FF_API_AVCODEC_IDENT */
+
#define FF_SANE_NB_CHANNELS 63U
typedef struct FramePool {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2c3f2f2..7d62588 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -38,8 +38,6 @@
LIBAVCODEC_VERSION_MICRO)
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
-#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_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
@@ -118,5 +116,12 @@
#ifndef FF_API_NEG_LINESIZES
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_AVCODEC_IDENT
+#define FF_API_AVCODEC_IDENT (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
+
+#if FF_API_AVCODEC_IDENT
+#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+#endif /* FF_API_AVCODEC_IDENT */
#endif /* AVCODEC_VERSION_H */
diff --git a/libavformat/internal.h b/libavformat/internal.h
index e92f476..0c2e866 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -22,7 +22,15 @@
#define AVFORMAT_INTERNAL_H
#include <stdint.h>
+
+#include "libavutil/avutil.h"
#include "avformat.h"
+#include "version.h"
+
+#if ! FF_API_AVFORMAT_IDENT
+#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+#endif /* FF_API_AVFORMAT_IDENT */
+
#define MAX_URL_SIZE 4096
diff --git a/libavformat/version.h b/libavformat/version.h
index 23a9d67..2bfa3bf 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -41,8 +41,6 @@
LIBAVFORMAT_VERSION_MICRO)
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
-#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_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
@@ -51,5 +49,12 @@
#ifndef FF_API_REFERENCE_DTS
#define FF_API_REFERENCE_DTS (LIBAVFORMAT_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_AVFORMAT_IDENT
+#define FF_API_AVFORMAT_IDENT (LIBAVFORMAT_VERSION_MAJOR < 56)
+#endif
+
+#if FF_API_AVFORMAT_IDENT
+#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
+#endif /* FF_API_AVFORMAT_IDENT */
#endif /* AVFORMAT_VERSION_H */
diff --git a/libavresample/version.h b/libavresample/version.h
index 3cc4441..867e688 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -37,8 +37,6 @@
LIBAVRESAMPLE_VERSION_MICRO)
#define LIBAVRESAMPLE_BUILD LIBAVRESAMPLE_VERSION_INT
-#define LIBAVRESAMPLE_IDENT "Lavr" AV_STRINGIFY(LIBAVRESAMPLE_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
@@ -48,5 +46,12 @@
#ifndef FF_API_RESAMPLE_CLOSE_OPEN
#define FF_API_RESAMPLE_CLOSE_OPEN (LIBAVRESAMPLE_VERSION_MAJOR < 2)
#endif
+#ifndef FF_API_RESAMPLE_IDENT
+#define FF_API_RESAMPLE_IDENT (LIBAVRESAMPLE_VERSION_MAJOR < 2)
+#endif
+
+#if FF_API_RESAMPLE_IDENT
+#define LIBAVRESAMPLE_IDENT "Lavr" AV_STRINGIFY(LIBAVRESAMPLE_VERSION)
+#endif /* FF_API_RESAMPLE_IDENT */
#endif /* AVRESAMPLE_VERSION_H */
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 6bb5510..d68c396 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -311,4 +311,8 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
* @}
*/
+#if FF_API_AVUTIL_IDENT
+#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
+#endif /* FF_API_AVUTIL_IDENT */
+
#endif /* AVUTIL_AVUTIL_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index eafc521..b9ce13c 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -48,8 +48,6 @@
LIBAVUTIL_VERSION_MICRO)
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
-#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
/**
* @}
*
@@ -94,6 +92,9 @@
#ifndef FF_API_INTFLOAT
#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 53)
#endif
+#ifndef FF_API_AVUTIL_IDENT
+#define FF_API_AVUTIL_IDENT (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
/**
* @}
diff --git a/libswscale/version.h b/libswscale/version.h
index 5483673..d06204a 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -38,8 +38,6 @@
LIBSWSCALE_VERSION_MICRO)
#define LIBSWSCALE_BUILD LIBSWSCALE_VERSION_INT
-#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
@@ -52,5 +50,12 @@
#ifndef FF_API_SWS_CPU_CAPS
#define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 3)
#endif
+#ifndef FF_API_SWS_IDENT
+#define FF_API_SWS_IDENT (LIBSWSCALE_VERSION_MAJOR < 3)
+#endif
+
+#if FF_API_SWS_IDENT
+#define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
+#endif /* FF_API_SWS_IDENT */
#endif /* SWSCALE_VERSION_H */
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
