patched ffmpeg nov 2

source/patched-ffmpeg-mt/libavformat/matroskaenc.c

Index: source/patched-ffmpeg-mt/libavformat/matroskaenc.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/matroskaenc.c	(revision 65184)
+++ source/patched-ffmpeg-mt/libavformat/matroskaenc.c	(working copy)
@@ -752,6 +752,8 @@
     ebml_master tags = {0};
     int i, ret;
 
+    ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
+
     if (av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) {
         ret = mkv_write_tag(s, s->metadata, 0, 0, &tags);
         if (ret < 0) return ret;
@@ -1186,7 +1188,6 @@
     .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
     .codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
     .subtitle_codec = CODEC_ID_TEXT,
-    .metadata_conv = ff_mkv_metadata_conv,
 };
 #endif
 
@@ -1220,6 +1221,5 @@
     mkv_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
     .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
-    .metadata_conv = ff_mkv_metadata_conv,
 };
 #endif