Merge branch 'v0.16.x'

Conflicts:
	NEWS
	configure.ac
	src/decoder/ffmpeg_decoder_plugin.c
	test/read_tags.c
This commit is contained in:
Max Kellermann
2012-02-13 19:15:18 +01:00
6 changed files with 24 additions and 6 deletions

View File

@@ -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 },