rtpproto: Add an option for writing return packets to the address of the last receive...

[ffmpeg] / libavformat / metadata.h

diff --git a/libavformat/metadata.h b/libavformat/metadata.h
index 49be8b47e1b86f149348c9ebc60755e2e86fba3a..eee3ee4391e97c426541f6db931fc13e99898d53 100644 (file)
--- a/libavformat/metadata.h
+++ b/libavformat/metadata.h
@@ -31,15 +31,12 @@
 #include "avformat.h"
 #include "libavutil/dict.h"
 
-struct AVMetadataConv{
+typedef struct AVMetadataConv {
     const char *native;
     const char *generic;
-};
-#if !FF_API_OLD_METADATA2
-typedef struct AVMetadataConv AVMetadataConv;
-#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);