X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmetadata.h;h=eee3ee4391e97c426541f6db931fc13e99898d53;hb=6c86a63bad7700848b1e46337038cf5bd06abbe6;hp=43eace8e390c3473baa72db53c3605d42791ff74;hpb=451d566f4b51bd4d371d7125fe458bcac3869a77;p=ffmpeg

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 43eace8e390..eee3ee4391e 100644
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -29,26 +29,14 @@
 
 
 #include "avformat.h"
+#include "libavutil/dict.h"
 
-struct AVMetadata{
-    int count;
-    AVMetadataTag *elems;
-};
-
-struct AVMetadataConv{
+typedef struct AVMetadataConv {
     const char *native;
     const char *generic;
-};
-#if !FF_API_OLD_METADATA2
-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
+} AVMetadataConv;
 
-void ff_metadata_conv(AVMetadata **pm, const AVMetadataConv *d_conv,
+void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv,
                                        const AVMetadataConv *s_conv);
 void ff_metadata_conv_ctx(AVFormatContext *ctx, const AVMetadataConv *d_conv,
                                                 const AVMetadataConv *s_conv);