[FFmpeg-devel] [PATCH 1/2] lavf: postpone removal of public metadata conversion API

[Anton Khirnov]

---
 libavformat/avformat.h |    4 ++--
 libavformat/metadata.c |    2 ++
 libavformat/metadata.h |    2 +-
 libavformat/version.h  |    3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 3fd7f75..3e25a20 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -117,7 +117,7 @@ typedef struct {
 }AVMetadataTag;
 
 typedef struct AVMetadata AVMetadata;
-#if FF_API_OLD_METADATA
+#if FF_API_OLD_METADATA2
 typedef struct AVMetadataConv AVMetadataConv;
 #endif
 
@@ -158,7 +158,7 @@ attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const
  */
 int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
 
-#if FF_API_OLD_METADATA
+#if FF_API_OLD_METADATA2
 /**
  * This function is provided for compatibility reason and currently does nothing.
  */
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index 7d9a864..68d42fd 100644
--- a/libavformat/metadata.c
+++ b/libavformat/metadata.c
@@ -91,7 +91,9 @@ int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
 {
     return av_metadata_set2(pm, key, value, 0);
 }
+#endif
 
+#if FF_API_OLD_METADATA2
 void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
                                             const AVMetadataConv *s_conv)
 {
diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 9e86650..dd9b690 100644
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -39,7 +39,7 @@ struct AVMetadataConv{
     const char *native;
     const char *generic;
 };
-#if !FF_API_OLD_METADATA
+#if !FF_API_OLD_METADATA2
 typedef struct AVMetadataConv AVMetadataConv;
 #endif
 
diff --git a/libavformat/version.h b/libavformat/version.h
index 494cf11..f42deb6 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,6 +47,9 @@
 #ifndef FF_API_OLD_METADATA
 #define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_OLD_METADATA2
+#define FF_API_OLD_METADATA2           (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
 #ifndef FF_API_URL_CLASS
 #define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
 #endif
-- 
1.7.2.3