diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-10-15 19:04:25 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-15 19:04:25 +0000 |
| commit | 03700d399bcc749ad7916f2d39a99527f37c8b6e (patch) | |
| tree | 20d22335ebef2e37679f6e3c71d1e264c1e38fe5 /libavformat/matroskaenc.c | |
| parent | ed09233fa2b081e3f60c02267fe9d17e0bb45396 (diff) | |
| download | ffmpeg-03700d399bcc749ad7916f2d39a99527f37c8b6e.tar.gz | |
Export metadata in the generic format. Deprecate old conversion API.
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 29fddce50c..80bb08ef4f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -752,6 +752,8 @@ 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; @@ -1186,7 +1188,6 @@ AVOutputFormat matroska_muxer = { .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 @@ AVOutputFormat matroska_audio_muxer = { mkv_write_trailer, .flags = AVFMT_GLOBALHEADER, .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, - .metadata_conv = ff_mkv_metadata_conv, }; #endif |