aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/asfenc.c
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-10-15 19:04:25 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-10-15 19:04:25 +0000
commit03700d399bcc749ad7916f2d39a99527f37c8b6e (patch)
tree20d22335ebef2e37679f6e3c71d1e264c1e38fe5 /libavformat/asfenc.c
parented09233fa2b081e3f60c02267fe9d17e0bb45396 (diff)
downloadffmpeg-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/asfenc.c')
-rw-r--r--libavformat/asfenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index 9f8d69ac5c..863709b2ca 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -279,6 +279,8 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
int bit_rate;
int64_t duration;
+ metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL);
+
tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0);
tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0);
tags[2] = av_metadata_get(s->metadata, "copyright", NULL, 0);
@@ -870,7 +872,6 @@ AVOutputFormat asf_muxer = {
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
- .metadata_conv = ff_asf_metadata_conv,
};
#endif
@@ -892,6 +893,5 @@ AVOutputFormat asf_stream_muxer = {
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
- .metadata_conv = ff_asf_metadata_conv,
};
#endif //CONFIG_ASF_STREAM_MUXER