From 451d566f4b51bd4d371d7125fe458bcac3869a77 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 23 Feb 2011 07:38:52 +0100
Subject: lavf: postpone removal of public metadata conversion API

It's been deprecated only a few months ago, long after 0.6.
---
 libavformat/avformat.h | 8 ++++----
 libavformat/metadata.c | 2 ++
 libavformat/metadata.h | 2 +-
 libavformat/version.h  | 3 +++
 4 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 24c7958111..77114e62e6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -118,7 +118,7 @@ typedef struct {
 }AVMetadataTag;
 
 typedef struct AVMetadata AVMetadata;
-#if FF_API_OLD_METADATA
+#if FF_API_OLD_METADATA2
 typedef struct AVMetadataConv AVMetadataConv;
 #endif
 
@@ -159,7 +159,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.
  */
@@ -317,7 +317,7 @@ typedef struct AVOutputFormat {
 
     enum CodecID subtitle_codec; /**< default subtitle codec */
 
-#if FF_API_OLD_METADATA
+#if FF_API_OLD_METADATA2
     const AVMetadataConv *metadata_conv;
 #endif
 
@@ -437,7 +437,7 @@ typedef struct AVInputFormat {
      */
     int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);
 
-#if FF_API_OLD_METADATA
+#if FF_API_OLD_METADATA2
     const AVMetadataConv *metadata_conv;
 #endif
 
diff --git a/libavformat/metadata.c b/libavformat/metadata.c
index 9ecc0a9191..36a9342882 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 0d2f1ab4a6..43eace8e39 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 887901bc1e..03b90c1208 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
-- 
cgit v1.2.3