From 8a98be1a089f9782a5d72f2f2e07022083b8a68e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 13 Dec 2009 21:01:49 +0000 Subject: [PATCH] s/author/artist/ for ID3 from ffmbc Originally committed as revision 20838 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/id3v1.c | 2 +- libavformat/id3v2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c index d201cde84a..aca36e5ab5 100644 --- a/libavformat/id3v1.c +++ b/libavformat/id3v1.c @@ -209,7 +209,7 @@ static int parse_tag(AVFormatContext *s, const uint8_t *buf) buf[2] == 'G')) return -1; get_string(s, "title", buf + 3, 30); - get_string(s, "author", buf + 33, 30); + get_string(s, "artist", buf + 33, 30); get_string(s, "album", buf + 63, 30); get_string(s, "year", buf + 93, 4); get_string(s, "comment", buf + 97, 30); diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 9bc1d0f1c6..c09f79cffa 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -241,7 +241,7 @@ const AVMetadataConv ff_id3v2_metadata_conv[] = { { "TENC", "encoder"}, { "TIT2", "title"}, { "TLAN", "language"}, - { "TPE1", "author"}, + { "TPE1", "artist"}, { "TPOS", "disc"}, { "TPUB", "publisher"}, { "TRCK", "track"},