patched ffmpeg nov 2

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

 /*
  * Matroska muxer
  * Copyright (c) 2007 David Conrad
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 734 matching lines @@
 
     end_ebml_master(s->pb, tag);
     return 0;
 }
 
 static int mkv_write_tags(AVFormatContext *s)
 {
     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;
     }
 
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st = s->streams[i];
 
         if (!av_metadata_get(st->metadata, "", 0, AV_METADATA_IGNORE_SUFFIX))
             continue;
@@ skipping 414 matching lines @@
     "mkv",
     sizeof(MatroskaMuxContext),
     CODEC_ID_MP2,
     CODEC_ID_MPEG4,
     mkv_write_header,
     mkv_write_packet,
     mkv_write_trailer,
     .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
 
 #if CONFIG_WEBM_MUXER
 AVOutputFormat webm_muxer = {
     "webm",
     NULL_IF_CONFIG_SMALL("WebM file format"),
     "video/webm",
     "webm",
     sizeof(MatroskaMuxContext),
@@ skipping 13 matching lines @@
     "audio/x-matroska",
     "mka",
     sizeof(MatroskaMuxContext),
     CODEC_ID_MP2,
     CODEC_ID_NONE,
     mkv_write_header,
     mkv_write_packet,
     mkv_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
     .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
-    .metadata_conv = ff_mkv_metadata_conv,
 };
 #endif