From 103832742d4ef2b6bb86d287b8557ab3e64dba21 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 13 Feb 2012 19:05:39 +0100
Subject: decoder/ffmpeg: read the "year" tag

This was disabled when compiled with a new ffmpeg version.  Older
ffmpeg versions used it explicitly, while newer ones may pass it
through from the codec.
---
 NEWS                                | 1 +
 src/decoder/ffmpeg_decoder_plugin.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1f19983a7..aa6ef9516 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ ver 0.16.8 (2012/??/??)
 * fix for libsamplerate assertion failure
 * decoder:
   - vorbis (and others): fix seeking at startup
+  - ffmpeg: read the "year" tag
 
 
 ver 0.16.7 (2012/02/04)
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 52632dc4a..2929d316a 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -597,8 +597,8 @@ typedef struct ffmpeg_tag_map {
 static const ffmpeg_tag_map ffmpeg_tag_maps[] = {
 #if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8))
 	{ TAG_ARTIST,            "author" },
-	{ TAG_DATE,              "year" },
 #endif
+	{ TAG_DATE,              "year" },
 	{ TAG_ARTIST_SORT,       "author-sort" },
 	{ TAG_ALBUM_ARTIST,      "album_artist" },
 	{ TAG_ALBUM_ARTIST_SORT, "album_artist-sort" },
-- 
cgit v1.2.3