Export metadata in the generic format. Deprecate old conversion API.

[ffmpeg] / libavformat / metadata.h

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 62c47a69763332c2751631b778a2488773802dce..197ca515e6d8eb7c0af876f00d2beb6088db912c 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -39,13 +39,18 @@ struct AVMetadataConv{
     const char *native;
     const char *generic;
 };
+#if !FF_API_OLD_METADATA
+typedef struct AVMetadataConv AVMetadataConv;
+#endif
 
-#if LAVF_API_OLD_METADATA
+#if FF_API_OLD_METADATA
 void ff_metadata_demux_compat(AVFormatContext *s);
 void ff_metadata_mux_compat(AVFormatContext *s);
 #endif
 
 void metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
                                     const AVMetadataConv *s_conv);
+void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
+                                                const AVMetadataConv *s_conv);
 
 #endif /* AVFORMAT_METADATA_H */