From 1f5e9ede233b4acd5324af2686a9a8ffcb9a9a9d Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 23 Feb 2011 08:01:35 +0100
Subject: [PATCH] lavf: postpone removal of public metadata conversion API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 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 4f25d66dc8..843bd08ee4 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 7d9a8645df..68d42fd257 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 9e866503b5..dd9b69005c 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 494cf11a25..f42deb6320 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
-- 
2.11.0