patched ffmpeg nov 2

source/patched-ffmpeg-mt/libavformat/metadata.h

Index: source/patched-ffmpeg-mt/libavformat/metadata.h
===================================================================
--- source/patched-ffmpeg-mt/libavformat/metadata.h	(revision 65184)
+++ source/patched-ffmpeg-mt/libavformat/metadata.h	(working copy)
@@ -39,13 +39,18 @@
     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(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 */