diff options
| author | Max Kellermann <max@duempel.org> | 2012-02-13 19:15:18 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-02-13 19:15:18 +0100 |
| commit | c616165f81a07feb42b96b6078885b2a10c8908f (patch) | |
| tree | d21c8c77c007e6de0bf50c6daf8f5998d8d978fd /src/decoder | |
| parent | edac498d03b9de59d4e55081c92604ff2447a298 (diff) | |
| parent | 103832742d4ef2b6bb86d287b8557ab3e64dba21 (diff) | |
| download | mpd-c616165f81a07feb42b96b6078885b2a10c8908f.tar.gz mpd-c616165f81a07feb42b96b6078885b2a10c8908f.tar.xz mpd-c616165f81a07feb42b96b6078885b2a10c8908f.zip | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
configure.ac
src/decoder/ffmpeg_decoder_plugin.c
test/read_tags.c
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/ffmpeg_metadata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/decoder/ffmpeg_metadata.c b/src/decoder/ffmpeg_metadata.c index df700fc01..3d59ec1a9 100644 --- a/src/decoder/ffmpeg_metadata.c +++ b/src/decoder/ffmpeg_metadata.c @@ -28,8 +28,8 @@ static const struct tag_table ffmpeg_tags[] = { #if LIBAVFORMAT_VERSION_INT < ((52<<16)+(50<<8)) { "author", TAG_ARTIST }, - { "year", TAG_DATE }, #endif + { "year", TAG_DATE }, { "author-sort", TAG_ARTIST_SORT }, { "album_artist", TAG_ALBUM_ARTIST }, { "album_artist-sort", TAG_ALBUM_ARTIST_SORT }, |