From 9fed97b1f1eb6af0d5121e00095fac1e9db03262 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 28 Oct 2009 22:17:10 +0100 Subject: [PATCH] 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". --- src/decoder/ffmpeg_plugin.c | 3 +-- 1 file changed, 1 insertion(+), 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");