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 2826ecc72e3ae65545d257d4cf52ac6d817ed180..197ca515e6d8eb7c0af876f00d2beb6088db912c 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -22,7 +22,7 @@
 #define AVFORMAT_METADATA_H
 
 /**
- * @file metadata.h
+ * @file
  * internal metadata API header
  * see avformat.h or the public API!
  */
@@ -35,8 +35,22 @@ struct AVMetadata{
     AVMetadataTag *elems;
 };
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-void ff_metadata_sync_compat(AVFormatContext *s);
+struct AVMetadataConv{
+    const char *native;
+    const char *generic;
+};
+#if !FF_API_OLD_METADATA
+typedef struct AVMetadataConv AVMetadataConv;
+#endif
+
+#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 */