diff options
| author | James Darnley <james.darnley@gmail.com> | 2010-07-11 11:28:46 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-07-11 11:28:46 +0000 |
| commit | 90d9d97d4d66308fb8baa6c96df2572d1144b22e (patch) | |
| tree | 4e55dbab449cd2b461dd68d86afc21386afd51cf /libavformat | |
| parent | 8b834ac5d9f32bff432eb84cd4b78eae01a7abe7 (diff) | |
| download | ffmpeg-90d9d97d4d66308fb8baa6c96df2572d1144b22e.tar.gz | |
Fix ID3v1 tags in mp3 files
Patch by James Darnley, james dot darnley at gmail
Originally committed as revision 24189 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/mp3.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 4249428180..36669bd57f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -118,7 +118,7 @@ OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o riff.o isom.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o movenchint.o -OBJS-$(CONFIG_MP2_MUXER) += mp3.o id3v1.o +OBJS-$(CONFIG_MP2_MUXER) += mp3.o id3v1.o id3v2.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o id3v1.o id3v2.o OBJS-$(CONFIG_MP3_MUXER) += mp3.o id3v1.o id3v2.o OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o id3v1.o id3v2.o apetag.o diff --git a/libavformat/mp3.c b/libavformat/mp3.c index bdb2e4ec0a..11ce59cec4 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -214,18 +214,18 @@ static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf) buf[0] = 'T'; buf[1] = 'A'; buf[2] = 'G'; - count += id3v1_set_string(s, "title", buf + 3, 30); - count += id3v1_set_string(s, "author", buf + 33, 30); - count += id3v1_set_string(s, "album", buf + 63, 30); - count += id3v1_set_string(s, "date", buf + 93, 4); + count += id3v1_set_string(s, "TIT2", buf + 3, 30); //title + count += id3v1_set_string(s, "TPE1", buf + 33, 30); //author|artist + count += id3v1_set_string(s, "TALB", buf + 63, 30); //album + count += id3v1_set_string(s, "TDRL", buf + 93, 4); //date count += id3v1_set_string(s, "comment", buf + 97, 30); - if ((tag = av_metadata_get(s->metadata, "track", NULL, 0))) { + if ((tag = av_metadata_get(s->metadata, "TRCK", NULL, 0))) { //track buf[125] = 0; buf[126] = atoi(tag->value); count++; } buf[127] = 0xFF; /* default to unknown genre */ - if ((tag = av_metadata_get(s->metadata, "genre", NULL, 0))) { + if ((tag = av_metadata_get(s->metadata, "TCON", NULL, 0))) { //genre for(i = 0; i <= ID3v1_GENRE_MAX; i++) { if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) { buf[127] = i; @@ -290,6 +290,7 @@ AVOutputFormat mp2_muxer = { NULL, mp3_write_packet, mp3_write_trailer, + .metadata_conv = ff_id3v2_metadata_conv, }; #endif |