From: Andre Noll <maan@systemlinux.org>
Date: Fri, 23 Jan 2015 12:17:38 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/afh_improvements'
X-Git-Tag: v0.5.4~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a7967902aa937e91d35767b3eba2b77343e8b822

Merge branch 'refs/heads/t/afh_improvements'

Was cooking for about a week.

	mp3_afh: Detect both v1 and v2 tags.
	ogg: Improve documentation of struct ogg_afh_callback_info.
	ogg_afh: Add a comment about the three vorbis header packets.
	afh_common.c: Avoid ifdefs.
	afh loglevel adjustments.
	wma: Rename comment_header.
	afh: Fix fd leak.
	afh: Unmap the audio file on errors.
---

a7967902aa937e91d35767b3eba2b77343e8b822
diff --cc NEWS
index b9d032fc,b9d032fc..ddd70a13
--- a/NEWS
+++ b/NEWS
@@@ -16,6 -16,6 +16,7 @@@ Another cleanup and bugfix release
  	- audiod memory leak fixes.
  	- Miscellaneous improvements to the build system.
  	- oss_writer improvements.
++	- Improved handling of mp3 files with both id3v1 and id3v2 tags.
  
  Download: ./releases/paraslash-git.tar.bz2 (tarball)