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/mp3.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/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index 4dfffec6de..77b131d5d5 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -195,7 +195,6 @@ AVInputFormat mp3_demuxer = { mp3_read_packet, .flags= AVFMT_GENERIC_INDEX, .extensions = "mp2,mp3,m2a", /* XXX: use probe */ - .metadata_conv = ff_id3v2_metadata_conv, }; #endif @@ -294,7 +293,6 @@ AVOutputFormat mp2_muxer = { NULL, mp3_write_packet, mp3_write_trailer, - .metadata_conv = ff_id3v2_metadata_conv, }; #endif @@ -317,6 +315,7 @@ static int mp3_write_header(struct AVFormatContext *s) size_pos = url_ftell(s->pb); put_be32(s->pb, 0); + metadata_conv(&s->metadata, ff_id3v2_metadata_conv, NULL); while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) { uint32_t tag = 0; @@ -366,6 +365,5 @@ AVOutputFormat mp3_muxer = { mp3_write_packet, mp3_write_trailer, AVFMT_NOTIMESTAMPS, - .metadata_conv = ff_id3v2_metadata_conv, }; #endif |