Mercurial > libavformat.hg
changeset 6250:f7b036d62ba9 libavformat
Fix ID3v1 tags in mp3 files
Patch by James Darnley, james dot darnley at gmail
| author | mstorsjo |
|---|---|
| date | Sun, 11 Jul 2010 11:28:46 +0000 |
| parents | 63edc8683095 |
| children | 0db22f6ec19e |
| files | Makefile mp3.c |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sat Jul 10 23:42:08 2010 +0000 +++ b/Makefile Sun Jul 11 11:28:46 2010 +0000 @@ -118,7 +118,7 @@ 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
--- a/mp3.c Sat Jul 10 23:42:08 2010 +0000 +++ b/mp3.c Sun Jul 11 11:28:46 2010 +0000 @@ -214,18 +214,18 @@ 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 @@ NULL, mp3_write_packet, mp3_write_trailer, + .metadata_conv = ff_id3v2_metadata_conv, }; #endif