aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-10-28 22:17:10 +0100
committerMax Kellermann <max@duempel.org>2009-10-28 22:17:10 +0100
commit9fed97b1f1eb6af0d5121e00095fac1e9db03262 (patch)
tree59f614328c90ba450aa8e335a7c0904d60428e73 /src
parent83a9cf74fb7613bbd76ea6a5359712061f5db182 (diff)
downloadmpd-9fed97b1f1eb6af0d5121e00095fac1e9db03262.tar.gz
mpd-9fed97b1f1eb6af0d5121e00095fac1e9db03262.tar.xz
mpd-9fed97b1f1eb6af0d5121e00095fac1e9db03262.zip
decoder/ffmpeg: removed the "author" vs "artist" workaround
libavformat gives us the song artist in the "author" field. Since we use av_metadata_conv(), we don't need to check for "artist".
Diffstat (limited to 'src')
-rw-r--r--src/decoder/ffmpeg_plugin.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index be9de3bf2..63f0f7ece 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -364,8 +364,7 @@ static bool ffmpeg_tag_internal(struct ffmpeg_context *ctx)
av_metadata_conv(f, NULL, f->iformat->metadata_conv);
ffmpeg_copy_metadata(tag, f->metadata, TAG_TITLE, "title");
- if (!ffmpeg_copy_metadata(tag, f->metadata, TAG_ARTIST, "author"))
- ffmpeg_copy_metadata(tag, f->metadata, TAG_ARTIST, "artist");
+ ffmpeg_copy_metadata(tag, f->metadata, TAG_ARTIST, "author");
ffmpeg_copy_metadata(tag, f->metadata, TAG_ALBUM, "album");
ffmpeg_copy_metadata(tag, f->metadata, TAG_COMMENT, "comment");
ffmpeg_copy_metadata(tag, f->metadata, TAG_GENRE, "genre");