Revision 03700d39 libavformat/matroskaenc.c

View differences:

libavformat/matroskaenc.c
752 752
    ebml_master tags = {0};
753 753
    int i, ret;
754 754

  
755
    ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
756

  
755 757
    if (av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) {
756 758
        ret = mkv_write_tag(s, s->metadata, 0, 0, &tags);
757 759
        if (ret < 0) return ret;
......
1186 1188
    .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
1187 1189
    .codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
1188 1190
    .subtitle_codec = CODEC_ID_TEXT,
1189
    .metadata_conv = ff_mkv_metadata_conv,
1190 1191
};
1191 1192
#endif
1192 1193

  
......
1220 1221
    mkv_write_trailer,
1221 1222
    .flags = AVFMT_GLOBALHEADER,
1222 1223
    .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
1223
    .metadata_conv = ff_mkv_metadata_conv,
1224 1224
};
1225 1225
#endif

Also available in: Unified diff