1. ffmpeg
  2. Commit 1f5e9ede233b4acd5324af2686a9a8ffcb9a9a9d
Browse code

lavf: postpone removal of public metadata conversion API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Anton Khirnov authored on 2011/02/23 16:01:35
Showing 4 changed files
libavformat/avformat.h
History View file @ 1f5e9ed
... ... 
@@ -117,7 +117,7 @@ typedef struct {
117 117 
 }AVMetadataTag;
118 118
119 119 
 typedef struct AVMetadata AVMetadata;
120 
-#if FF_API_OLD_METADATA
120 
+#if FF_API_OLD_METADATA2
121 121 
 typedef struct AVMetadataConv AVMetadataConv;
122 122 
 #endif
123 123
... ... 
@@ -158,7 +158,7 @@ attribute_deprecated int av_metadata_set(AVMetadata **pm, const char *key, const
158 158 
  */
159 159 
 int av_metadata_set2(AVMetadata **pm, const char *key, const char *value, int flags);
160 160
161 
-#if FF_API_OLD_METADATA
161 
+#if FF_API_OLD_METADATA2
162 162 
 /**
163 163 
  * This function is provided for compatibility reason and currently does nothing.
164 164 
  */
libavformat/metadata.c
History View file @ 1f5e9ed
... ... 
@@ -91,7 +91,9 @@ int av_metadata_set(AVMetadata **pm, const char *key, const char *value)
91 91 
 {
92 92 
     return av_metadata_set2(pm, key, value, 0);
93 93 
 }
94 
+#endif
94 95
96 
+#if FF_API_OLD_METADATA2
95 97 
 void av_metadata_conv(AVFormatContext *ctx, const AVMetadataConv *d_conv,
96 98 
                                             const AVMetadataConv *s_conv)
97 99 
 {
libavformat/metadata.h
History View file @ 1f5e9ed
... ... 
@@ -39,7 +39,7 @@ struct AVMetadataConv{
39 39 
     const char *native;
40 40 
     const char *generic;
41 41 
 };
42 
-#if !FF_API_OLD_METADATA
42 
+#if !FF_API_OLD_METADATA2
43 43 
 typedef struct AVMetadataConv AVMetadataConv;
44 44 
 #endif
45 45
libavformat/version.h
History View file @ 1f5e9ed
... ... 
@@ -47,6 +47,9 @@
47 47 
 #ifndef FF_API_OLD_METADATA
48 48 
 #define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
49 49 
 #endif
50 
+#ifndef FF_API_OLD_METADATA2
51 
+#define FF_API_OLD_METADATA2           (LIBAVFORMAT_VERSION_MAJOR < 54)
52 
+#endif
50 53 
 #ifndef FF_API_URL_CLASS
51 54 
 #define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
52 55 
 #endif