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/avienc.c | |
| parent | ed09233fa2b081e3f60c02267fe9d17e0bb45396 (diff) | |
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/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 161fb1bfc7..744e0a63c0 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -290,12 +290,7 @@ static int avi_write_header(AVFormatContext *s) return -1; } ff_end_tag(pb, strf); - if ((t = av_metadata_get(s->streams[i]->metadata, "strn", NULL, 0))) { - avi_write_info_tag(s->pb, t->key, t->value); - t = NULL; - } - //FIXME a limitation of metadata conversion system - else if ((t = av_metadata_get(s->streams[i]->metadata, "INAM", NULL, 0))) { + if ((t = av_metadata_get(s->streams[i]->metadata, "title", NULL, 0))) { avi_write_info_tag(s->pb, "strn", t->value); t = NULL; } @@ -375,6 +370,7 @@ static int avi_write_header(AVFormatContext *s) list2 = ff_start_tag(pb, "LIST"); put_tag(pb, "INFO"); + metadata_conv(&s->metadata, ff_avi_metadata_conv, NULL); for (i = 0; *ff_avi_tags[i]; i++) { if ((t = av_metadata_get(s->metadata, ff_avi_tags[i], NULL, AV_METADATA_MATCH_CASE))) avi_write_info_tag(s->pb, t->key, t->value); @@ -647,5 +643,4 @@ AVOutputFormat avi_muxer = { avi_write_trailer, .codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .flags= AVFMT_VARIABLE_FPS, - .metadata_conv = ff_avi_metadata_conv, }; |