shithub: aacdec

Download patch

ref: 345a313f90dc665c7d66ce4efd7a60afafac71cd
parent: e7a69a62164a19f1382b2de4e3c5e641a0588c55
author: menno <menno>
date: Thu Jun 19 17:20:59 EDT 2003

Fix in foo_mp4 plugin

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,1372 @@
+2003-06-08  menno
+	* libfaad/Makefile.am 1.12:
+		fixed makefile (I hope)
+
+	* frontend/Makefile.am 1.8:
+		updated makefile
+
+	* frontend/Makefile.am 1.9:
+		fixed makefile
+
+2003-06-07  menno
+	* frontend/main.c 1.32:
+	* plugins/foo_mp4/foo_mp4.cpp 1.32:
+		small updates in error handling
+
+2003-05-31  menno
+	* plugins/in_mp4/aacinfo.c 1.4:
+	* plugins/in_mp4/in_mp4.c 1.30:
+		fixed some stuff in winamp plugin
+
+2003-05-29  menno
+	* plugins/foo_mp4/foo_mp4.cpp 1.31:
+	* plugins/in_mp4/in_mp4.c 1.29:
+		Fixed foobar ADIF support
+		
+		seeking in RAW and ADIF AAC files now supported in in_mp4
+
+	* plugins/in_mp4/in_mp4.c 1.28:
+		Updates in in_mp4:
+		- dithering option fixed
+		- seeking in AAC ADTS files supported
+		- faster file length calculation (and more accurate)
+		
+		Although this is a little bit of an experimental version, it should work ok for now.
+		Things that do not work correctly yet:
+		 - ADIF file length calculation (ADIF files play fine though)
+		 - Seeking in ADIF and RAW files
+
+2003-05-22  menno
+	* CoreAAC/COPYING 1.1:
+	* CoreAAC/aacdec.cpp 1.1:
+	* CoreAAC/aacdec.def 1.1:
+	* CoreAAC/aacdec.dsp 1.1:
+	* CoreAAC/aacdec.dsw 1.1:
+	* CoreAAC/aacdec.h 1.1:
+	* CoreAAC/aacdec.rc 1.1:
+	* CoreAAC/aacdec.vcproj 1.1:
+	* CoreAAC/register_debug.bat 1.1:
+	* CoreAAC/register_release.bat 1.1:
+	* CoreAAC/resource.h 1.1:
+	* CoreAAC/unregister_debug.bat 1.1:
+	* CoreAAC/unregister_release.bat 1.1:
+		CoreAAC DShow filter added
+
+2003-05-21  menno
+	* plugins/foo_mp4/foo_mp4.cpp 1.30:
+		fixed seeking past end of file
+
+2003-05-18  menno
+	* libfaad/codebook/hcb.h 1.4:
+	* libfaad/codebook/hcb_1.c 1.3:
+	* libfaad/codebook/hcb_1.h 1.1:
+	* libfaad/codebook/hcb_10.c 1.3:
+	* libfaad/codebook/hcb_10.h 1.1:
+	* libfaad/codebook/hcb_11.c 1.3:
+	* libfaad/codebook/hcb_11.h 1.1:
+	* libfaad/codebook/hcb_2.c 1.3:
+	* libfaad/codebook/hcb_2.h 1.1:
+	* libfaad/codebook/hcb_3.c 1.3:
+	* libfaad/codebook/hcb_3.h 1.1:
+	* libfaad/codebook/hcb_4.c 1.3:
+	* libfaad/codebook/hcb_4.h 1.1:
+	* libfaad/codebook/hcb_5.c 1.3:
+	* libfaad/codebook/hcb_5.h 1.1:
+	* libfaad/codebook/hcb_6.c 1.3:
+	* libfaad/codebook/hcb_6.h 1.1:
+	* libfaad/codebook/hcb_7.c 1.3:
+	* libfaad/codebook/hcb_7.h 1.1:
+	* libfaad/codebook/hcb_8.c 1.3:
+	* libfaad/codebook/hcb_8.h 1.1:
+	* libfaad/codebook/hcb_9.c 1.3:
+	* libfaad/codebook/hcb_9.h 1.1:
+	* libfaad/codebook/hcb_sf.c 1.3:
+	* libfaad/codebook/hcb_sf.h 1.1:
+	* libfaad/dither.c 1.8:
+	* libfaad/libfaad.dsp 1.26:
+		Modified huffman decoding tables
+
+2003-05-16  menno
+	* libfaad/fixed.h 1.7:
+	* libfaad/iq_table.h 1.3:
+	* libfaad/specrec.c 1.21:
+		More fixed point updates
+		only problem now is clipping when using REAL_BITS=16
+
+2003-05-15  menno
+	* libfaad/decoder.c 1.56:
+	* libfaad/fixed.h 1.6:
+	* libfaad/iq_table.h 1.2:
+	* libfaad/libfaad.dsp 1.25:
+	* libfaad/mdct.c 1.25:
+	* libfaad/specrec.c 1.20:
+	* libfaad/specrec.h 1.11:
+		FIXED_POINT changes
+
+2003-05-07  menno
+	* aacDECdrop/decode.c 1.13:
+	* frontend/main.c 1.31:
+	* plugins/QCDMp4/QCDMp4.c 1.2:
+	* plugins/foo_mp4/foo_mp4.cpp 1.29:
+	* plugins/in_mp4/in_mp4.c 1.27:
+		Updated all programs/plugins to work with Apple M4A files as well
+
+2003-04-28  menno
+	* plugins/foo_mp4/foo_mp4.cpp 1.28:
+		Fixed small problem with id3v2 in foobar plugin
+
+	* plugins/QCD/QCDFAAD.c 1.2:
+	* plugins/QCD/QCDFAAD.dsp 1.2:
+	* plugins/QCD/logo.bmp 1.1:
+	* plugins/QCD/plugin_dlg.rc 1.2:
+	* plugins/QCD/resource.h 1.2:
+		new QCD plugin
+
+	* plugins/QCDMp4/AAC2Mp4Enc.c 1.1:
+	* plugins/QCDMp4/QCDConvertDLL.h 1.1:
+	* plugins/QCDMp4/QCDInputDLL.h 1.1:
+	* plugins/QCDMp4/QCDModDefs.h 1.1:
+	* plugins/QCDMp4/QCDModEncode.h 1.1:
+	* plugins/QCDMp4/QCDModInput.h 1.1:
+	* plugins/QCDMp4/QCDMp4.c 1.1:
+	* plugins/QCDMp4/QCDMp4.dsp 1.1:
+	* plugins/QCDMp4/QCDMp4.dsw 1.1:
+	* plugins/QCDMp4/QCDMp4.rc 1.1:
+	* plugins/QCDMp4/QCDMp4.sln 1.1:
+	* plugins/QCDMp4/QCDMp4.vcproj 1.1:
+	* plugins/QCDMp4/aac2mp4.cpp 1.1:
+	* plugins/QCDMp4/aac2mp4.h 1.1:
+	* plugins/QCDMp4/aacinfo.c 1.1:
+	* plugins/QCDMp4/aacinfo.h 1.1:
+	* plugins/QCDMp4/config.c 1.1:
+	* plugins/QCDMp4/config.h 1.1:
+	* plugins/QCDMp4/logo.bmp 1.1:
+	* plugins/QCDMp4/mbs.h 1.1:
+	* plugins/QCDMp4/resource.h 1.1:
+	* plugins/QCDMp4/utils.c 1.1:
+	* plugins/QCDMp4/utils.h 1.1:
+		new QCD MP4 plugin
+
+2003-04-27  menno
+	* plugins/foo_mp4/foo_mp4.cpp 1.25:
+		seeking forward and file info for foobar plugin
+
+	* libfaad/decoder.c 1.55:
+	* libfaad/error.h 1.4:
+	* plugins/foo_mp4/foo_mp4.cpp 1.27:
+		full seeking support in foobar plugin
+		error return problem fixed
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.22:
+		foobar plugin cleanup, better tag support
+
+2003-04-26  menno
+	* libfaad/output.c 1.16:
+	* plugins/foo_mp4/foo_mp4.cpp 1.20:
+		foobar plugin: some warning/error changes
+		libfaad: removed clipping for float and double
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.18:
+		raw AAC support for foobar2000 plugin
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.21:
+		foobar tag reading for .aac
+
+2003-04-15  menno
+	* libfaad/syntax.c 1.44:
+		prevent index out of range
+
+2003-04-13  menno
+	* libfaad/error.c 1.9:
+	* libfaad/pulse.c 1.5:
+	* libfaad/pulse.h 1.4:
+	* libfaad/syntax.c 1.43:
+	* libfaad/syntax.h 1.27:
+		more bitstream error resilience
+
+2003-04-02  menno
+	* plugins/foo_mp4/foo_mp4.cpp 1.17:
+		More updates to foobar2000 plugin
+
+	* libfaad/syntax.c 1.42:
+		Little fix in HCR bitstream reading
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.16:
+	* plugins/foo_mp4/foo_mp4.dsp 1.4:
+		Updates in foobar2000 plugin
+
+	* common/mp4v2/libmp4v2_cb.dsp 1.4:
+	* frontend/main.c 1.30:
+	* include/faad.h 1.21:
+	* libfaad/decoder.c 1.54:
+	* libfaad/decoder.h 1.22:
+	* libfaad/output.c 1.15:
+	* plugins/foo_mp4/foo_mp4.cpp 1.15:
+		library can now output 64 bit doubles
+
+	* common/mp4v2/libmp4v2_cb.dsp 1.3:
+	* libfaad/pulse.c 1.4:
+	* libfaad/pulse.h 1.3:
+	* libfaad/rvlc.c 1.4:
+	* libfaad/syntax.c 1.41:
+		More bitstream error protection
+
+2003-04-01  menno
+	* libfaad/bits.h 1.17:
+	* libfaad/fixed.h 1.5:
+	* libfaad/hcr.c 1.3:
+	* libfaad/syntax.c 1.40:
+	* libfaad/syntax.h 1.26:
+		stability fixes and ARM fixed point optimisations
+
+2003-03-05  menno
+	* plugins/winamp3/FAAD.cpp 1.6:
+	* plugins/winamp3/Readme.txt 1.2:
+	* plugins/winamp3/cnv_FAAD.cpp 1.4:
+		updated winamp3 plugin
+
+	* frontend/main.c 1.29:
+	* include/faad.h 1.20:
+	* libfaad/decoder.c 1.53:
+	* libfaad/decoder.h 1.21:
+		Added capabilities function
+
+2003-02-27  menno
+	* aacDECdrop/audio.c 1.9:
+	* frontend/audio.c 1.12:
+		Fix in wave header writing
+
+2003-02-25  menno
+	* plugins/winamp3/FAAD.cpp 1.4:
+	* plugins/winamp3/FAAD.h 1.2:
+	* plugins/winamp3/cnv_FAAD.cpp 1.2:
+	* plugins/winamp3/cnv_FAAD.dsp 1.3:
+		Fix in winamp3 plugin so that it uses faad.h from the include directory
+
+	* common/faad/aacinfo.h 1.2:
+	* plugins/winamp3/FAAD.cpp 1.5:
+	* plugins/winamp3/aacInfoLib.dsp 1.3:
+	* plugins/winamp3/cnv_FAAD.cpp 1.3:
+	* plugins/winamp3/cnv_FAAD.dsp 1.4:
+	* plugins/winamp3/faadwa3.h 1.1:
+		Fixed Winamp3 plugin compilation
+
+	* aacDECdrop/aacDECdrop/aacDECdrop.dsp 1.6:
+	* libfaad/libfaad.dsp 1.24:
+		Fixed aacDECdrop compilation
+
+	* common/mp4v2/mp4.h 1.11:
+	* common/mp4v2/mp4file.cpp 1.11:
+		Fix in function naming :)
+
+	* common/mp4v2/mp4file.cpp 1.10:
+		Fix in tag writing of strings > 128 characters
+
+	* plugins/in_mp4/config.c 1.2:
+	* plugins/in_mp4/config.h 1.2:
+	* plugins/in_mp4/in_mp4.c 1.26:
+	* plugins/in_mp4/in_mp4.rc 1.6:
+	* plugins/in_mp4/resource.h 1.4:
+		Added "Use for AAC" option (hardly tested, but should work)
+
+2003-02-24  menno
+	* libfaad/bits.c 1.21:
+	* libfaad/decoder.c 1.52:
+		Fixes to bitstream
+
+2003-02-16  menno
+	* aacDECdrop/audio.c 1.8:
+	* aacDECdrop/audio.h 1.7:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.12:
+	* frontend/faad.vcproj 1.9:
+	* libfaad/bits.c 1.19:
+	* libfaad/bits.h 1.16:
+	* libfaad/decoder.c 1.51:
+	* libfaad/error.c 1.8:
+	* libfaad/libfaad.dsp 1.23:
+	* libfaad/libfaad.vcproj 1.22:
+	* libfaad/specrec.c 1.19:
+		Better bitstream error handling, it's not possible to read more bits than in the input buffer
+		Some small speedups
+
+	* libfaad/bits.c 1.20:
+		changed little thing in bit reading back
+
+2003-02-14  menno
+	* libfaad/tns.c 1.19:
+	* libfaad/tns.h 1.6:
+		Made TNS more non-conformant-encoder safe
+
+2003-02-13  menno
+	* frontend/Makefile.am 1.6:
+	* frontend/main.c 1.28:
+	* libfaad/Makefile.am 1.11:
+		Small makefile changes
+
+	* frontend/Makefile.am 1.7:
+		fixed makefile
+
+2003-02-09  menno
+	* aacDECdrop/decode.c 1.12:
+	* frontend/main.c 1.27:
+	* include/faad.h 1.19:
+	* libfaad/decoder.c 1.50:
+	* libfaad/libfaad.dsp 1.22:
+	* libfaad/mp4.c 1.14:
+	* libfaad/mp4.h 1.7:
+	* libfaad/structs.h 1.5:
+	* libfaad/syntax.c 1.39:
+	* libfaad/syntax.h 1.25:
+	* plugins/foo_mp4/foo_mp4.cpp 1.14:
+	* plugins/in_mp4/utils.c 1.5:
+	* plugins/winamp3/FAAD.cpp 1.3:
+		Updated interface function for mp4 AudioSpecificConfig
+		now is a lot cleaner to use
+
+	* plugins/QCD/QCDFAAD.c 1.1:
+	* plugins/QCD/QCDFAAD.dsp 1.1:
+	* plugins/QCD/QCDFAAD.dsw 1.1:
+	* plugins/QCD/QCDInputDLL.h 1.1:
+	* plugins/QCD/QCDModDefs.h 1.1:
+	* plugins/QCD/QCDModInput.h 1.1:
+	* plugins/QCD/ReadMe.txt 1.1:
+	* plugins/QCD/plugin_dlg.rc 1.1:
+	* plugins/QCD/resource.h 1.1:
+		Added plugin for Quintessential Player (QCD)
+
+2003-02-06  menno
+	* frontend/audio.c 1.11:
+		Fixed bug in wav header writing
+
+	* common/mp4av/libmp4av_st.dsp 1.4:
+	* common/mp4v2/libmp4v2_st60.dsp 1.7:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.11:
+	* frontend/faad.dsp 1.10:
+	* frontend/faad.vcproj 1.8:
+	* frontend/main.c 1.26:
+	* include/faad.h 1.18:
+	* libfaad/common.h 1.29:
+	* libfaad/decoder.c 1.49:
+	* libfaad/libfaad.dsp 1.21:
+	* libfaad/libfaad.sln 1.2:
+	* libfaad/libfaad.vcproj 1.21:
+	* libfaad/structs.h 1.4:
+	* plugins/in_mp4/in_mp4.dsp 1.9:
+		Added samplerate field to frameInfo
+
+2003-02-04  menno
+	* libfaad/decoder.c 1.48:
+	* libfaad/filtbank.c 1.24:
+	* libfaad/mdct.c 1.24:
+	* plugins/foo_mp4/foo_mp4.cpp 1.13:
+	* plugins/foo_mp4/foo_mp4.dsw 1.3:
+		Bugfixes, NULL pointer checks...
+
+2003-01-17  menno
+	* libfaad/decoder.c 1.47:
+	* libfaad/libfaad.vcproj 1.20:
+	* libfaad/syntax.c 1.38:
+		Small bugfixes
+
+2003-01-12  menno
+	* common/mp4v2/Makefile.am 1.7:
+	* common/mp4v2/libmp4v2_cb.vcproj 1.4:
+	* common/mp4v2/mp4.cpp 1.10:
+	* common/mp4v2/mp4.h 1.10:
+	* common/mp4v2/mp4file.cpp 1.9:
+	* configure.in 1.7:
+		Fixed linux compilation
+
+2002-12-29  menno
+	* common/mp4v2/atom_tag4.cpp 1.1:
+	* common/mp4v2/atoms.h 1.3:
+	* common/mp4v2/libmp4v2_cb.dsp 1.2:
+	* common/mp4v2/libmp4v2_cb.vcproj 1.3:
+	* common/mp4v2/libmp4v2_st60.dsp 1.6:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.10:
+	* common/mp4v2/mp4.cpp 1.7:
+	* common/mp4v2/mp4.h 1.7:
+	* common/mp4v2/mp4atom.cpp 1.3:
+	* common/mp4v2/mp4file.cpp 1.6:
+	* common/mp4v2/mp4file.h 1.6:
+	* common/mp4v2/mp4property.cpp 1.4:
+	* common/mp4v2/mp4property.h 1.4:
+	* plugins/foo_mp4/foo_mp4.cpp 1.8:
+	* plugins/foo_mp4/foo_mp4.sln 1.3:
+		Added mp4 tagging support (also to foo_mp4)
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.10:
+		Fixed tagging in foo_mp4
+
+	* common/mp4v2/mp4.cpp 1.9:
+	* common/mp4v2/mp4.h 1.9:
+	* common/mp4v2/mp4file.cpp 1.8:
+	* common/mp4v2/mp4file.h 1.8:
+	* plugins/foo_mp4/foo_mp4.cpp 1.12:
+		replaygain stuff fixed for foobar
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.9:
+	* plugins/foo_mp4/foo_mp4.sln 1.4:
+		Bugfix
+
+	* common/mp4v2/mp4.cpp 1.8:
+	* common/mp4v2/mp4.h 1.8:
+	* common/mp4v2/mp4file.cpp 1.7:
+	* common/mp4v2/mp4file.h 1.7:
+	* plugins/foo_mp4/foo_mp4.cpp 1.11:
+		Some bugfixes in tagging.
+		replaygain support
+
+2002-12-27  menno
+	* aacDECdrop/aacDECdrop/aacDECdrop.vcproj 1.5:
+	* common/id3lib/libprj/id3lib.vcproj 1.5:
+	* common/id3lib/zlib/prj/zlib.vcproj 1.4:
+	* common/mp4av/libmp4av_st.vcproj 1.4:
+	* common/mp4v2/libmp4v2_cb.vcproj 1.2:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.9:
+	* frontend/faad.vcproj 1.7:
+	* libfaad/libfaad.vcproj 1.19:
+	* plugins/foo_mp4/foo_mp4.vcproj 1.4:
+	* plugins/in_mp4/in_mp4.vcproj 1.7:
+	* plugins/winamp/in_faad.vcproj 1.4:
+		Made VC7 project files use static runtimes because it seems not
+		everyone has those files yet
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.7:
+		foo_mp4: updated for 0.34
+
+	* common/mp4v2/libmp4v2_cb.dsp 1.1:
+	* common/mp4v2/libmp4v2_cb.vcproj 1.1:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.8:
+	* common/mp4v2/mp4.cpp 1.6:
+	* common/mp4v2/mp4.h 1.6:
+	* common/mp4v2/mp4file.cpp 1.5:
+	* common/mp4v2/mp4file.h 1.5:
+	* common/mp4v2/mp4file_io.cpp 1.4:
+	* common/mp4v2/mp4track.cpp 1.4:
+	* common/mp4v2/systems.h 1.8:
+	* frontend/faad.vcproj 1.6:
+	* libfaad/libfaad.dsp 1.20:
+	* libfaad/libfaad.vcproj 1.18:
+	* plugins/foo_mp4/foo_mp4.cpp 1.6:
+	* plugins/foo_mp4/foo_mp4.dsp 1.3:
+	* plugins/foo_mp4/foo_mp4.dsw 1.2:
+	* plugins/foo_mp4/foo_mp4.sln 1.2:
+	* plugins/foo_mp4/foo_mp4.vcproj 1.3:
+		Added file callback functionality to mp4 file library
+		Updated foo_mp4 to use it
+
+2002-12-26  menno
+	* plugins/foo_mp4/compiling.txt 1.1:
+	* plugins/foo_mp4/foo_mp4.cpp 1.1:
+	* plugins/foo_mp4/foo_mp4.dsp 1.1:
+	* plugins/foo_mp4/foo_mp4.dsw 1.1:
+	* plugins/foo_mp4/foo_mp4.sln 1.1:
+	* plugins/foo_mp4/foo_mp4.vcproj 1.1:
+		Added foobar2000 plugin
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.3:
+		bitrate in kbps :)
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.4:
+		Cleaner seeking
+		set_info() return value changed
+
+	* plugins/foo_mp4/foo_mp4.cpp 1.5:
+		unsigned integer change
+
+	* aacDECdrop/aacDECdrop/aacDECdrop.dsp 1.5:
+	* aacDECdrop/aacDECdrop/aacDECdrop.vcproj 1.4:
+	* common/id3lib/libprj/id3lib.dsp 1.2:
+	* common/id3lib/libprj/id3lib.vcproj 1.4:
+	* common/id3lib/zlib/prj/zlib.dsp 1.2:
+	* common/id3lib/zlib/prj/zlib.vcproj 1.3:
+	* common/mp4av/libmp4av_st.dsp 1.3:
+	* common/mp4av/libmp4av_st.vcproj 1.3:
+	* common/mp4v2/isma.cpp 1.6:
+	* common/mp4v2/libmp4v2_st60.dsp 1.5:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.7:
+	* common/mp4v2/mp4.cpp 1.5:
+	* common/mp4v2/win32_ver.h 1.5:
+	* frontend/faad.dsp 1.9:
+	* frontend/faad.vcproj 1.5:
+	* libfaad/libfaad.dsp 1.19:
+	* libfaad/libfaad.vcproj 1.17:
+	* plugins/foo_mp4/foo_mp4.dsp 1.2:
+	* plugins/foo_mp4/foo_mp4.vcproj 1.2:
+	* plugins/in_mp4/in_mp4.dsp 1.8:
+	* plugins/in_mp4/in_mp4.vcproj 1.6:
+	* plugins/winamp/in_faad.dsp 1.3:
+	* plugins/winamp/in_faad.vcproj 1.3:
+	* plugins/winamp3/aacInfoLib.dsp 1.2:
+	* plugins/winamp3/cnv_FAAD.dsp 1.2:
+		Small changes
+		Changed to use multithreaded dll runtime libraries
+
+2002-12-22  menno
+	* plugins/in_mp4/in_mp4.c 1.25:
+		SetThreadAffinity should fix SMP problems
+
+	* libfaad/data.c 1.6:
+	* libfaad/data.h 1.6:
+	* libfaad/decoder.c 1.46:
+	* libfaad/pns.c 1.20:
+	* libfaad/specrec.c 1.18:
+	* libfaad/syntax.c 1.37:
+	* libfaad/syntax.h 1.24:
+		Changes from latest MPEG corrigendum
+
+	* libfaad/rvlc.c 1.3:
+		Bugfix in rvlc, buffer that was not allocated got deallocated
+
+2002-12-11  menno
+	* frontend/Makefile.am 1.5:
+		makefile fix
+
+	* libfaad/decoder.c 1.45:
+		Fixes for frames without channel elements
+
+2002-12-10  menno
+	* common/mp4v2/atom_stdp.cpp 1.2:
+	* common/mp4v2/isma.cpp 1.5:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.6:
+	* common/mp4v2/mp4atom.cpp 1.2:
+	* common/mp4v2/systems.h 1.7:
+	* common/mp4v2/win32_ver.h 1.4:
+	* configure.in 1.6:
+	* frontend/Makefile.am 1.4:
+	* frontend/faad.vcproj 1.4:
+	* include/faad.h 1.17:
+	* libfaad/bits.c 1.18:
+	* libfaad/bits.h 1.15:
+	* libfaad/common.h 1.28:
+	* libfaad/syntax.c 1.36:
+		Updates for DRM
+
+	* libfaad/decoder.c 1.44:
+	* libfaad/decoder.h 1.20:
+	* libfaad/libfaad.vcproj 1.16:
+	* libfaad/ssr.c 1.3:
+	* libfaad/ssr.h 1.3:
+	* libfaad/ssr_ipqf.c 1.2:
+	* libfaad/ssr_ipqf.h 1.2:
+	* libfaad/structs.h 1.3:
+	* libfaad/syntax.c 1.35:
+		Various bugfixes
+		Cleanup of syntax.c
+
+2002-12-06  menno
+	* plugins/in_mp4/in_mp4.c 1.22:
+		Dithered output works!
+
+	* plugins/in_mp4/in_mp4.c 1.23:
+		DSP plugin support for in_mp4
+
+	* plugins/in_mp4/in_mp4.c 1.21:
+		Faster RAW AAC support: less file info
+
+	* plugins/in_mp4/in_mp4.c 1.24:
+		better title display
+
+2002-12-05  menno
+	* libfaad/decoder.c 1.42:
+	* libfaad/error.c 1.7:
+	* libfaad/syntax.c 1.33:
+		Better bit error handling
+
+	* libfaad/Makefile.am 1.10:
+	* libfaad/common.h 1.27:
+	* libfaad/decoder.c 1.43:
+	* libfaad/decoder.h 1.19:
+	* libfaad/dither.c 1.7:
+	* libfaad/hcr.c 1.2:
+	* libfaad/libfaad.vcproj 1.15:
+	* libfaad/rvlc.c 1.2:
+	* libfaad/syntax.c 1.34:
+		Linux and DRM fixes
+
+2002-12-02  menno
+	* libfaad/decoder.c 1.41:
+	* libfaad/libfaad.vcproj 1.14:
+	* libfaad/ssr.c 1.2:
+	* libfaad/ssr.h 1.2:
+	* libfaad/structs.h 1.2:
+		mono decoding bug
+		some more ssr stuff
+
+2002-11-28  menno
+	* libfaad/Makefile.am 1.9:
+	* libfaad/bits.c 1.17:
+	* libfaad/bits.h 1.14:
+	* libfaad/cfft.c 1.10:
+	* libfaad/cfft.h 1.5:
+	* libfaad/common.c 1.5:
+	* libfaad/common.h 1.26:
+	* libfaad/decoder.c 1.40:
+	* libfaad/decoder.h 1.18:
+	* libfaad/drc.c 1.12:
+	* libfaad/drc.h 1.6:
+	* libfaad/filtbank.c 1.23:
+	* libfaad/filtbank.h 1.10:
+	* libfaad/hcr.c 1.1:
+	* libfaad/ic_predict.c 1.10:
+	* libfaad/ic_predict.h 1.6:
+	* libfaad/is.c 1.10:
+	* libfaad/libfaad.dsp 1.18:
+	* libfaad/libfaad.vcproj 1.13:
+	* libfaad/libfaad2_dll.dsp 1.11:
+	* libfaad/libfaad2_dll.vcproj 1.4:
+	* libfaad/lt_predict.c 1.10:
+	* libfaad/mdct.c 1.23:
+	* libfaad/mdct.h 1.13:
+	* libfaad/mp4.c 1.13:
+	* libfaad/ms.c 1.4:
+	* libfaad/output.c 1.14:
+	* libfaad/pns.c 1.19:
+	* libfaad/pulse.c 1.3:
+	* libfaad/reordered_spectral_data.c 1.9:
+	* libfaad/rvlc.c 1.1:
+	* libfaad/rvlc.h 1.1:
+	* libfaad/rvlc_scale_factors.c 1.7:
+	* libfaad/rvlc_scale_factors.h 1.4:
+	* libfaad/specrec.c 1.17:
+	* libfaad/specrec.h 1.10:
+	* libfaad/ssr.c 1.1:
+	* libfaad/ssr.h 1.1:
+	* libfaad/ssr_fb.c 1.1:
+	* libfaad/ssr_fb.h 1.1:
+	* libfaad/ssr_ipqf.c 1.1:
+	* libfaad/ssr_ipqf.h 1.1:
+	* libfaad/ssr_win.h 1.1:
+	* libfaad/structs.h 1.1:
+	* libfaad/syntax.c 1.32:
+	* libfaad/syntax.h 1.23:
+	* libfaad/tns.c 1.18:
+		First start at SSR
+		Cleanup of syntax.c
+
+2002-11-08  menno
+	* libfaad/bits.c 1.16:
+	* libfaad/decoder.c 1.39:
+	* libfaad/dither.c 1.6:
+	* libfaad/drc.c 1.11:
+	* libfaad/filtbank.c 1.22:
+	* libfaad/reordered_spectral_data.c 1.8:
+	* libfaad/syntax.c 1.31:
+		Some small compatibility issues
+
+	* libfaad/bits.c 1.15:
+	* libfaad/bits.h 1.13:
+		Small changes for WinCE
+
+2002-11-07  menno
+	* libfaad/bits.h 1.12:
+	* libfaad/cfft.c 1.9:
+	* libfaad/filtbank.c 1.21:
+	* libfaad/fixed.h 1.4:
+	* libfaad/libfaad.vcproj 1.12:
+	* libfaad/libfaad2.vcp 1.1:
+	* libfaad/libfaad2.vcw 1.1:
+	* libfaad/mdct.c 1.22:
+		Small changes for WinCE
+
+2002-11-01  menno
+	* aacDECdrop/aacDECdrop/aacDECdrop.vcproj 1.3:
+	* aacDECdrop/decode.c 1.11:
+	* common/id3lib/libprj/id3lib.vcproj 1.3:
+	* common/id3lib/zlib/prj/zlib.vcproj 1.2:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.5:
+	* frontend/faad.vcproj 1.3:
+	* frontend/main.c 1.25:
+	* include/faad.h 1.16:
+	* libfaad/bits.c 1.14:
+	* libfaad/bits.h 1.11:
+	* libfaad/decoder.c 1.38:
+	* libfaad/decoder.h 1.17:
+	* libfaad/libfaad.vcproj 1.11:
+	* libfaad/mp4.c 1.12:
+	* libfaad/mp4.h 1.6:
+	* libfaad/rvlc_scale_factors.c 1.6:
+	* plugins/in_mp4/in_mp4.c 1.20:
+	* plugins/in_mp4/utils.c 1.4:
+	* plugins/winamp/in_faad.c 1.4:
+	* plugins/winamp/in_faad.vcproj 1.2:
+	* plugins/winamp3/FAAD.cpp 1.2:
+	* plugins/xmms/src/libaac.c 1.2:
+		Small changes to the decoder interface:
+		every function that has a buffer as input now also has a parameter to give the size of that buffer.
+
+2002-10-30  menno
+	* cnv_FAAD.nsi 1.2:
+		Updated installer script
+
+2002-10-27  menno
+	* cnv_FAAD.nsi 1.1:
+	* cnv_aacpcm.nsi 1.3:
+	* plugins/winamp3/CRegistry.cpp 1.1:
+	* plugins/winamp3/CRegistry.h 1.1:
+	* plugins/winamp3/Copying 1.1:
+	* plugins/winamp3/Defines.h 1.1:
+	* plugins/winamp3/FAAD.cpp 1.1:
+	* plugins/winamp3/FAAD.h 1.1:
+	* plugins/winamp3/FAAD_config.xml 1.1:
+	* plugins/winamp3/Readme.txt 1.1:
+	* plugins/winamp3/aacInfoLib.dsp 1.1:
+	* plugins/winamp3/aacInfoLib.dsw 1.1:
+	* plugins/winamp3/aacpcm.cpp 1.3:
+	* plugins/winamp3/aacpcm.h 1.2:
+	* plugins/winamp3/cnv_FAAD.cpp 1.1:
+	* plugins/winamp3/cnv_FAAD.dsp 1.1:
+	* plugins/winamp3/cnv_FAAD.dsw 1.1:
+	* plugins/winamp3/cnv_FAAD.h 1.1:
+	* plugins/winamp3/cnv_aacpcm.cpp 1.3:
+	* plugins/winamp3/cnv_aacpcm.dsp 1.6:
+	* plugins/winamp3/cnv_aacpcm.dsw 1.3:
+	* plugins/winamp3/cnv_aacpcm.h 1.3:
+	* plugins/winamp3/cnv_aacpcm.sln 1.2:
+	* plugins/winamp3/cnv_aacpcm.vcproj 1.2:
+	* plugins/winamp3/compiling.txt 1.2:
+	* plugins/winamp3/resource.h 1.1:
+		Complete new Winamp3 plugin
+
+2002-10-26  menno
+	* libfaad/bits.c 1.13:
+	* libfaad/common.h 1.25:
+	* libfaad/syntax.c 1.30:
+	* libfaad/syntax.h 1.22:
+		Small changes
+
+2002-10-20  menno
+	* common/mp4av/l16.cpp 1.2:
+	* common/mp4av/libmp4av_st.dsp 1.2:
+	* common/mp4av/libmp4av_st.vcproj 1.2:
+	* common/mp4av/mpeg4.cpp 1.2:
+	* common/mp4av/rfc2250.cpp 1.2:
+	* common/mp4av/rfc3016.cpp 1.2:
+	* common/mp4av/rfc3119.cpp 1.2:
+	* common/mp4av/rfcisma.cpp 1.2:
+	* common/mp4v2/isma.cpp 1.4:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.4:
+	* common/mp4v2/mp4.cpp 1.4:
+	* common/mp4v2/mp4.h 1.5:
+	* common/mp4v2/mp4file.cpp 1.4:
+	* common/mp4v2/mp4file.h 1.4:
+	* common/mp4v2/mp4file_io.cpp 1.3:
+	* common/mp4v2/mp4info.cpp 1.3:
+	* common/mp4v2/mp4property.cpp 1.3:
+	* common/mp4v2/rtphint.cpp 1.3:
+	* common/mp4v2/rtphint.h 1.2:
+		Updated MP4 libraries
+
+2002-10-16  menno
+	* libfaad/decoder.c 1.37:
+	* libfaad/libfaad.dsp 1.17:
+	* libfaad/libfaad.vcproj 1.10:
+	* libfaad/libfaad2_dll.dsp 1.10:
+	* libfaad/libfaad2_dll.vcproj 1.3:
+	* libfaad/sbr_dec.c 1.4:
+	* libfaad/sbr_dec.h 1.3:
+	* libfaad/sbr_huff.c 1.4:
+	* libfaad/sbr_huff.h 1.4:
+	* libfaad/sbr_qmf.c 1.4:
+	* libfaad/sbr_qmf.h 1.4:
+	* libfaad/sbr_syntax.c 1.6:
+	* libfaad/sbr_syntax.h 1.5:
+	* libfaad/sbr_util.c 1.2:
+	* libfaad/sbr_util.h 1.2:
+		OK
+
+2002-10-11  menno
+	* include/faad.h 1.15:
+		Added some defines
+
+2002-10-09  menno
+	* plugins/in_mp4/in_mp4.dsp 1.7:
+	* plugins/in_mp4/in_mp4.dsw 1.4:
+	* plugins/in_mp4/in_mp4.vcproj 1.5:
+		project files for in_mp4 updated a little
+
+2002-10-05  menno
+	* common/mp4av/aac.cpp 1.1:
+	* common/mp4av/adts.cpp 1.1:
+	* common/mp4av/audio.cpp 1.1:
+	* common/mp4av/audio_hinters.cpp 1.1:
+	* common/mp4av/audio_hinters.h 1.1:
+	* common/mp4av/l16.cpp 1.1:
+	* common/mp4av/libmp4av.dsp 1.1:
+	* common/mp4av/libmp4av_st.dsp 1.1:
+	* common/mp4av/libmp4av_st.vcproj 1.1:
+	* common/mp4av/mbs.cpp 1.1:
+	* common/mp4av/mbs.h 1.1:
+	* common/mp4av/mp3.cpp 1.1:
+	* common/mp4av/mp4av.h 1.1:
+	* common/mp4av/mp4av_aac.h 1.1:
+	* common/mp4av/mp4av_adts.h 1.1:
+	* common/mp4av/mp4av_audio.h 1.1:
+	* common/mp4av/mp4av_common.h 1.1:
+	* common/mp4av/mp4av_hinters.h 1.1:
+	* common/mp4av/mp4av_mp3.h 1.1:
+	* common/mp4av/mp4av_mpeg3.h 1.1:
+	* common/mp4av/mp4av_mpeg4.h 1.1:
+	* common/mp4av/mpeg3.cpp 1.1:
+	* common/mp4av/mpeg4.cpp 1.1:
+	* common/mp4av/rfc2250.cpp 1.1:
+	* common/mp4av/rfc3016.cpp 1.1:
+	* common/mp4av/rfc3119.cpp 1.1:
+	* common/mp4av/rfcisma.cpp 1.1:
+	* plugins/in_mp4/aac2mp4.c 1.3:
+	* plugins/in_mp4/aac2mp4.cpp 1.1:
+	* plugins/in_mp4/aactrack.cpp 1.2:
+	* plugins/in_mp4/in_mp4.dsp 1.6:
+	* plugins/in_mp4/in_mp4.dsw 1.3:
+	* plugins/in_mp4/in_mp4.sln 1.2:
+	* plugins/in_mp4/in_mp4.vcproj 1.4:
+	* plugins/in_mp4/mbs.cpp 1.2:
+	* plugins/in_mp4/mp4av.h 1.2:
+	* plugins/in_mp4/mp4av_aac.cpp 1.2:
+	* plugins/in_mp4/mp4av_aac.h 1.2:
+	* plugins/in_mp4/mp4av_adts.cpp 1.2:
+	* plugins/in_mp4/mp4av_adts.h 1.2:
+	* plugins/in_mp4/mp4av_audio.cpp 1.2:
+	* plugins/in_mp4/mp4av_audio.h 1.2:
+	* plugins/in_mp4/mp4av_common.h 1.2:
+		Now using mpeg4ip mp4av library
+
+2002-10-02  menno
+	* libfaad/syntax.h 1.21:
+		Prevent out of bounds memory writing
+		(fixes LTP)
+
+2002-10-01  menno
+	* libfaad/common.c 1.4:
+	* libfaad/common.h 1.24:
+	* libfaad/dither.c 1.5:
+	* libfaad/pns.c 1.18:
+		Fixed random number generator
+
+2002-09-29  menno
+	* libfaad/bits.c 1.12:
+	* libfaad/rvlc_scale_factors.c 1.5:
+	* libfaad/rvlc_scale_factors.h 1.3:
+		Actual reverse RVLC, but doesn't work yet
+		problems with the escapes
+
+	* frontend/faad.dsp 1.8:
+	* libfaad/libfaad.dsp 1.16:
+	* libfaad/libfaad.vcproj 1.9:
+	* libfaad/libfaad2_dll.dsp 1.9:
+	* libfaad/libfaad2_dll.vcproj 1.2:
+	* libfaad/sbr_dec.h 1.2:
+	* libfaad/sbr_huff.h 1.3:
+	* libfaad/sbr_qmf.c 1.3:
+	* libfaad/sbr_qmf.h 1.3:
+	* libfaad/sbr_syntax.c 1.5:
+	* libfaad/sbr_syntax.h 1.4:
+	* libfaad/sbr_util.c 1.1:
+	* libfaad/sbr_util.h 1.1:
+		Some more initial work for SBR
+
+2002-09-28  menno
+	* libfaad/bits.c 1.10:
+	* libfaad/bits.h 1.9:
+		reverse bitreading functions
+		showbits_rev and flushbits_rev are tested, but initbits_rev is still untested
+
+	* libfaad/bits.c 1.11:
+	* libfaad/bits.h 1.10:
+		Reverse bitstream reading works
+
+2002-09-27  menno
+	* libfaad/common.c 1.3:
+	* libfaad/common.h 1.23:
+	* libfaad/decoder.c 1.36:
+	* libfaad/decoder.h 1.16:
+	* libfaad/filtbank.c 1.20:
+	* libfaad/huffman.h 1.12:
+	* libfaad/mp4.c 1.11:
+	* libfaad/pns.h 1.10:
+	* libfaad/syntax.c 1.29:
+	* libfaad/syntax.h 1.20:
+		Major cleanup of decoder.c
+		All bitstream functions are now in syntax.c
+
+2002-09-26  menno
+	* libfaad/bits.c 1.9:
+	* libfaad/bits.h 1.8:
+	* libfaad/cfft.c 1.8:
+	* libfaad/cfft.h 1.4:
+	* libfaad/cfft_tab.h 1.2:
+	* libfaad/common.h 1.22:
+	* libfaad/decoder.c 1.35:
+	* libfaad/huffman.h 1.11:
+	* libfaad/libfaad.vcproj 1.8:
+	* libfaad/mdct.c 1.21:
+	* libfaad/mdct.h 1.12:
+	* libfaad/syntax.c 1.28:
+		Big cleanup of FFT (completely using complex_t type now)
+		Changed bitstream reading functions
+		Reordered huffman decoding a bit
+
+2002-09-24  menno
+	* frontend/faad.dsp 1.7:
+	* frontend/main.c 1.24:
+		Fixed other than 16 bit decoding for MP4 files
+
+2002-09-18  menno
+	* libfaad/mp4.c 1.10:
+	* libfaad/syntax.c 1.27:
+		Bitstream reading of ER LTP files fixed
+
+2002-09-16  menno
+	* libfaad/huffman.h 1.10:
+	* libfaad/rvlc_scale_factors.c 1.4:
+		RVLC fix for PNS scalefactors
+
+	* libfaad/decoder.c 1.34:
+		Fix in LTP decoding
+
+2002-09-15  menno
+	* libfaad/data.c 1.5:
+	* libfaad/data.h 1.5:
+	* libfaad/specrec.c 1.16:
+	* libfaad/tns.c 1.17:
+	* libfaad/tns.h 1.5:
+		Some LD table fixes
+
+2002-09-13  menno
+	* libfaad/cfft.c 1.7:
+	* libfaad/cfft_tab.h 1.1:
+	* libfaad/common.h 1.21:
+	* libfaad/decoder.c 1.33:
+	* libfaad/dither.c 1.4:
+	* libfaad/dither.h 1.5:
+	* libfaad/mdct.c 1.20:
+	* libfaad/output.c 1.13:
+	* libfaad/pns.c 1.17:
+	* libfaad/tns.c 1.16:
+		Final fixed point updates
+
+2002-09-08  menno
+	* common/mp4v2/atoms.h 1.2:
+	* common/mp4v2/mp4.h 1.4:
+	* common/mp4v2/mp4common.h 1.2:
+	* common/mp4v2/mp4info.cpp 1.2:
+	* common/mp4v2/mp4track.cpp 1.3:
+	* frontend/audio.h 1.5:
+	* libfaad/Makefile.am 1.8:
+	* libfaad/cfft.h 1.3:
+	* libfaad/common.h 1.20:
+	* libfaad/decoder.c 1.32:
+	* libfaad/decoder.h 1.15:
+	* libfaad/dither.h 1.4:
+	* libfaad/drc.c 1.10:
+	* libfaad/drc.h 1.5:
+	* libfaad/filtbank.c 1.19:
+	* libfaad/fixed.h 1.3:
+	* libfaad/ic_predict.c 1.9:
+	* libfaad/iq_table.h 1.1:
+	* libfaad/is.c 1.9:
+	* libfaad/kbd_win.h 1.4:
+	* libfaad/libfaad.vcproj 1.7:
+	* libfaad/mdct.c 1.19:
+	* libfaad/mdct.h 1.11:
+	* libfaad/pns.c 1.16:
+	* libfaad/pns.h 1.9:
+	* libfaad/sine_win.h 1.1:
+	* libfaad/specrec.c 1.15:
+	* libfaad/specrec.h 1.9:
+		Some small bugfixes (linux compilation)
+		Lot's of fixed point stuff
+
+2002-09-05  menno
+	* libfaad/decoder.c 1.31:
+	* libfaad/pns.c 1.15:
+	* libfaad/specrec.c 1.14:
+	* libfaad/specrec.h 1.8:
+		Fixed fixed point decoding
+		output now bit identical to floating point version
+
+2002-09-04  menno
+	* libfaad/decoder.c 1.29:
+		Fixed more PNS stuff
+
+	* libfaad/decoder.c 1.30:
+		Damn PNS
+
+	* libfaad/pns.c 1.14:
+	* libfaad/pns.h 1.8:
+	* libfaad/syntax.h 1.19:
+		PNS fixed :-))
+
+2002-09-03  menno
+	* plugins/in_mp4/aac2mp4.c 1.2:
+	* plugins/in_mp4/aac2mp4.h 1.2:
+	* plugins/in_mp4/in_mp4.c 1.19:
+	* plugins/in_mp4/in_mp4.rc 1.5:
+		Filename can now be chosen when converting to mp4
+
+2002-08-30  menno
+	* plugins/xmms/AUTHORS 1.1:
+	* plugins/xmms/COPYING 1.2:
+	* plugins/xmms/ChangeLog 1.1:
+	* plugins/xmms/Makefile 1.2:
+	* plugins/xmms/Makefile.am 1.1:
+	* plugins/xmms/NEWS 1.1:
+	* plugins/xmms/README 1.2:
+	* plugins/xmms/TODO 1.1:
+	* plugins/xmms/aac-XMMS.c 1.2:
+	* plugins/xmms/bootstrap 1.1:
+	* plugins/xmms/configure.in 1.1:
+	* plugins/xmms/src/Makefile.am 1.1:
+	* plugins/xmms/src/Makefile.save 1.1:
+	* plugins/xmms/src/dialog_gtk1.c 1.1:
+	* plugins/xmms/src/id3.cpp 1.1:
+	* plugins/xmms/src/libaac.c 1.1:
+		Added new xmms plugin
+
+	* plugins/in_mp4/aac2mp4.c 1.1:
+	* plugins/in_mp4/aac2mp4.h 1.1:
+	* plugins/in_mp4/aacinfo.c 1.3:
+	* plugins/in_mp4/aactrack.cpp 1.1:
+	* plugins/in_mp4/in_mp4.c 1.18:
+	* plugins/in_mp4/in_mp4.rc 1.4:
+	* plugins/in_mp4/in_mp4.vcproj 1.3:
+	* plugins/in_mp4/mbs.cpp 1.1:
+	* plugins/in_mp4/mbs.h 1.1:
+	* plugins/in_mp4/mp4av.h 1.1:
+	* plugins/in_mp4/mp4av_aac.cpp 1.1:
+	* plugins/in_mp4/mp4av_aac.h 1.1:
+	* plugins/in_mp4/mp4av_adts.cpp 1.1:
+	* plugins/in_mp4/mp4av_adts.h 1.1:
+	* plugins/in_mp4/mp4av_audio.cpp 1.1:
+	* plugins/in_mp4/mp4av_audio.h 1.1:
+	* plugins/in_mp4/mp4av_common.h 1.1:
+	* plugins/in_mp4/resource.h 1.3:
+		Added option to convert aac file to mp4
+
+	* plugins/in_mp4/in_mp4.dsp 1.5:
+		Updated VC6 project files
+
+	* libfaad/decoder.c 1.27:
+	* libfaad/syntax.h 1.18:
+		Ouch, PNS bugfix for mono files
+
+	* libfaad/decoder.c 1.26:
+	* libfaad/pns.c 1.13:
+	* libfaad/pns.h 1.7:
+		Made PNS standard compliant
+
+	* libfaad/decoder.c 1.28:
+	* libfaad/decoder.h 1.14:
+		Fixes to PNS and more dynamic memory allocation
+
+	* libfaad/decoder.c 1.25:
+	* libfaad/decoder.h 1.13:
+	* libfaad/filtbank.c 1.18:
+	* libfaad/specrec.c 1.13:
+	* libfaad/specrec.h 1.7:
+		Bugfix in filterbank and dequantisation
+
+	* libfaad/pns.c 1.12:
+		Improved PNS
+
+2002-08-27  menno
+	* common/mp4v2/libmp4v2_st60.vcproj 1.3:
+	* libfaad/common.h 1.19:
+	* libfaad/decoder.c 1.24:
+	* libfaad/filtbank.c 1.17:
+	* libfaad/libfaad.vcproj 1.6:
+	* libfaad/lt_predict.c 1.9:
+	* libfaad/mdct.c 1.18:
+		Fixed point LTP
+
+	* include/faad.h 1.14:
+	* libfaad/cfft.c 1.6:
+	* libfaad/common.c 1.2:
+	* libfaad/common.h 1.18:
+	* libfaad/decoder.c 1.23:
+	* libfaad/decoder.h 1.12:
+	* libfaad/dither.c 1.3:
+	* libfaad/dither.h 1.3:
+	* libfaad/drc.c 1.9:
+	* libfaad/error.c 1.6:
+	* libfaad/error.h 1.3:
+	* libfaad/filtbank.c 1.16:
+	* libfaad/fixed.h 1.2:
+	* libfaad/libfaad.vcproj 1.5:
+	* libfaad/lt_predict.c 1.8:
+	* libfaad/mdct.c 1.17:
+	* libfaad/reordered_spectral_data.c 1.7:
+	* libfaad/specrec.c 1.12:
+	* libfaad/tns.c 1.15:
+		Fixed point decoding working correctly now
+
+2002-08-26  menno
+	* aacDECdrop/Script.rc 1.7:
+	* aacDECdrop/audio.c 1.7:
+	* aacDECdrop/audio.h 1.6:
+	* aacDECdrop/main.c 1.6:
+	* aacDECdrop/resource.h 1.5:
+	* frontend/audio.c 1.10:
+	* frontend/main.c 1.23:
+	* include/faad.h 1.13:
+	* libfaad/decoder.c 1.22:
+	* libfaad/decoder.h 1.11:
+	* libfaad/dither.c 1.2:
+	* libfaad/dither.h 1.2:
+	* libfaad/fixed.h 1.1:
+	* libfaad/output.c 1.12:
+	* libfaad/output.h 1.6:
+		Added noise shaping options by john33
+
+	* common/id3lib/libprj/id3lib.vcproj 1.2:
+	* common/mp4v2/libmp4v2_st60.dsp 1.4:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.2:
+	* include/faad.h 1.12:
+	* libfaad/cfft.c 1.5:
+	* libfaad/common.h 1.17:
+	* libfaad/decoder.c 1.21:
+	* libfaad/decoder.h 1.10:
+	* libfaad/drc.c 1.8:
+	* libfaad/filtbank.c 1.15:
+	* libfaad/filtbank.h 1.9:
+	* libfaad/is.c 1.8:
+	* libfaad/kbd_win.h 1.3:
+	* libfaad/libfaad.vcproj 1.4:
+	* libfaad/mdct.c 1.16:
+	* libfaad/output.c 1.11:
+	* libfaad/pns.c 1.11:
+	* libfaad/reordered_spectral_data.c 1.6:
+	* libfaad/specrec.c 1.11:
+	* libfaad/specrec.h 1.6:
+	* libfaad/syntax.h 1.17:
+	* libfaad/tns.c 1.14:
+		Fixed inverting MDCT/iMDCT
+		Fixed LTP
+		Complete new filterbank code
+		Complete new way of applying scalefactors and inverse quantisation
+		Fixed index bug in MDCT
+		Corrected object types in TNS
+		Fixed point almost working
+
+2002-08-21  menno
+	* frontend/audio.c 1.9:
+	* frontend/audio.h 1.4:
+		small changes to audio writing
+
+2002-08-20  menno
+	* libfaad/specrec.c 1.10:
+		Bugfix having to do with divide by 0, probably bug in Intel
+		Math library???
+
+2002-08-18  menno
+	* plugins/in_mp4/in_mp4.c 1.17:
+		skipping ID3v2 tags
+
+2002-08-17  menno
+	* libfaad/cfft.c 1.4:
+	* libfaad/common.h 1.16:
+	* libfaad/decoder.c 1.20:
+	* libfaad/drc.c 1.7:
+	* libfaad/drc.h 1.4:
+	* libfaad/filtbank.c 1.14:
+	* libfaad/ic_predict.c 1.8:
+	* libfaad/ic_predict.h 1.5:
+	* libfaad/is.c 1.7:
+	* libfaad/libfaad.vcproj 1.3:
+	* libfaad/lt_predict.c 1.7:
+	* libfaad/mdct.c 1.15:
+	* libfaad/pns.c 1.10:
+	* libfaad/specrec.c 1.9:
+	* libfaad/tns.c 1.13:
+		More preparations for fixed point
+
+	* libfaad/filtbank.c 1.13:
+	* libfaad/ic_predict.c 1.7:
+	* libfaad/mdct.c 1.14:
+	* libfaad/pns.c 1.9:
+		divide checks
+
+	* plugins/in_mp4/in_mp4.c 1.16:
+		temporarily removed support for dsp plugins
+
+	* libfaad/cfft.c 1.2:
+	* libfaad/cfft.h 1.2:
+	* libfaad/decoder.c 1.19:
+	* libfaad/decoder.h 1.9:
+	* libfaad/drc.c 1.6:
+	* libfaad/drc.h 1.3:
+	* libfaad/filtbank.c 1.12:
+	* libfaad/filtbank.h 1.8:
+	* libfaad/libfaad.dsp 1.15:
+	* libfaad/mdct.c 1.13:
+	* libfaad/mdct.h 1.10:
+		Memory allocation clean up
+
+	* libfaad/cfft.c 1.3:
+		Small updates in fft for fixed point
+
+	* frontend/audio.c 1.8:
+	* frontend/faad.dsp 1.6:
+		small changes in audio writing
+
+	* README.linux 1.2:
+		no more need for libsndfile
+
+2002-08-15  menno
+	* plugins/in_mp4/aacinfo.c 1.2:
+	* plugins/in_mp4/aacinfo.h 1.2:
+	* plugins/in_mp4/in_mp4.c 1.15:
+	* plugins/in_mp4/utils.c 1.3:
+		Removed seeking to test if the buggy part has something to do
+		with that
+
+	* aacDECdrop/decode.c 1.10:
+	* aacDECdrop/main.c 1.5:
+		Fixed aacDECdrop
+
+2002-08-14  menno
+	* aacDECdrop/Script.rc 1.5:
+	* aacDECdrop/audio.c 1.6:
+	* aacDECdrop/audio.h 1.5:
+	* frontend/audio.c 1.7:
+	* frontend/audio.h 1.3:
+	* frontend/main.c 1.22:
+		Float writing supported again
+
+	* plugins/in_mp4/aacinfo.c 1.1:
+	* plugins/in_mp4/aacinfo.h 1.1:
+	* plugins/in_mp4/in_mp4.c 1.14:
+	* plugins/in_mp4/in_mp4.dsp 1.4:
+	* plugins/in_mp4/in_mp4.rc 1.3:
+	* plugins/in_mp4/in_mp4.vcproj 1.2:
+	* plugins/in_mp4/resource.h 1.2:
+	* plugins/in_mp4/utils.c 1.2:
+	* plugins/in_mp4/utils.h 1.2:
+		New info box for mp4 plugin
+		mp4 plugin now supports seeking in aac files and info for aac files
+		(seems a bit buggy)
+
+	* libfaad/pns.c 1.8:
+		Better random function for PNS
+
+	* libfaad/pns.h 1.6:
+		Forgot to rename function definition
+
+	* aacDECdrop/aacDECdrop/aacDECdrop.dsw 1.3:
+		Updated project file for aacDECdrop
+
+	* aacDECdrop/Script.rc 1.6:
+	* aacDECdrop/decode.c 1.9:
+	* aacDECdrop/main.c 1.4:
+	* aacDECdrop/resource.h 1.4:
+		Updates in aacDECdrop
+
+2002-08-13  menno
+	* aacDECdrop/Script.rc 1.4:
+	* aacDECdrop/aacDECdrop/aacDECdrop.dsp 1.4:
+	* aacDECdrop/aacDECdrop/aacDECdrop.dsw 1.2:
+	* aacDECdrop/audio.c 1.5:
+	* aacDECdrop/audio.h 1.4:
+	* aacDECdrop/decode.c 1.7:
+	* aacDECdrop/decode.h 1.2:
+	* aacDECdrop/decthread.c 1.3:
+	* aacDECdrop/main.c 1.3:
+	* aacDECdrop/resource.h 1.3:
+	* frontend/audio.c 1.6:
+	* frontend/main.c 1.21:
+	* include/faad.h 1.11:
+	* libfaad/common.h 1.15:
+	* libfaad/decoder.h 1.8:
+	* libfaad/dither.c 1.1:
+	* libfaad/dither.h 1.1:
+	* libfaad/libfaad.vcproj 1.2:
+	* libfaad/output.c 1.10:
+	* libfaad/output.h 1.5:
+		Added option for dithered output
+		and some updates to aacDECdrop
+
+	* frontend/faad.dsp 1.5:
+	* frontend/faad.dsw 1.4:
+	* libfaad/libfaad.dsp 1.14:
+	* libfaad/libfaad2_dll.dsp 1.8:
+		Got to remember that a lot of people are still using VC6 :-)
+
+	* aacDECdrop/Script.rc 1.3:
+	* aacDECdrop/aacDECdrop/aacDECdrop.sln 1.2:
+	* aacDECdrop/aacDECdrop/aacDECdrop.vcproj 1.2:
+	* aacDECdrop/audio.c 1.4:
+	* aacDECdrop/audio.h 1.3:
+	* aacDECdrop/decode.c 1.6:
+	* frontend/audio.c 1.5:
+	* frontend/audio.h 1.2:
+	* frontend/faad.sln 1.2:
+	* frontend/faad.vcproj 1.2:
+	* frontend/main.c 1.20:
+		No more libsndfile
+
+	* aacDECdrop/decode.c 1.8:
+		Updates in aacDECdrop
+
+2002-08-10  menno
+	* aacDECdrop/aacDECdrop/aacDECdrop.sln 1.1:
+	* aacDECdrop/aacDECdrop/aacDECdrop.vcproj 1.1:
+	* common/faad/aacinfo.sln 1.1:
+	* common/faad/aacinfo.vcproj 1.1:
+	* common/id3lib/libprj/id3lib.sln 1.1:
+	* common/id3lib/libprj/id3lib.vcproj 1.1:
+	* common/id3lib/zlib/prj/zlib.sln 1.1:
+	* common/id3lib/zlib/prj/zlib.vcproj 1.1:
+	* common/mp4v2/libmp4v260.vcproj 1.1:
+	* common/mp4v2/libmp4v2_st60.vcproj 1.1:
+	* frontend/audio.c 1.4:
+	* frontend/faad.sln 1.1:
+	* frontend/faad.vcproj 1.1:
+	* frontend/main.c 1.19:
+	* include/faad.h 1.10:
+	* libfaad/bits.c 1.8:
+	* libfaad/libfaad.sln 1.1:
+	* libfaad/libfaad.vcproj 1.1:
+	* libfaad/libfaad2_dll.sln 1.1:
+	* libfaad/libfaad2_dll.vcproj 1.1:
+	* libfaad/mdct.c 1.12:
+	* libfaad/reordered_spectral_data.c 1.5:
+	* libfaad/rvlc_scale_factors.c 1.3:
+	* libfaad/syntax.c 1.26:
+	* plugins/in_mp4/in_mp4.sln 1.1:
+	* plugins/in_mp4/in_mp4.vcproj 1.1:
+	* plugins/winamp/in_faad.sln 1.1:
+	* plugins/winamp/in_faad.vcproj 1.1:
+	* plugins/winamp3/cnv_aacpcm.sln 1.1:
+	* plugins/winamp3/cnv_aacpcm.vcproj 1.1:
+		Added VC7 project files
+		As well as some small changes to avoid warnings
+
+2002-08-09  menno
+	* plugins/in_mp4/config.c 1.1:
+	* plugins/in_mp4/config.h 1.1:
+	* plugins/in_mp4/in_mp4.c 1.13:
+	* plugins/in_mp4/in_mp4.dsp 1.3:
+	* plugins/in_mp4/utils.c 1.1:
+	* plugins/in_mp4/utils.h 1.1:
+		Minimalistic AAC support for mp4 winamp plugin
+
+2002-08-08  menno
+	* plugins/winamp3/cnv_aacpcm.dsp 1.5:
+	* plugins/winamp3/compiling.txt 1.1:
+		Updated winamp3 plugin so that it works with the official
+		release version SDK
+
 2002-08-07  menno
+	* libfaad/syntax.c 1.25:
+		Final fix?
+
+	* libfaad/syntax.c 1.22:
+		Bugfix for non ER compilation
+
+	* libfaad/syntax.c 1.24:
+		fix for DRM
+
 	* libfaad/bits.c 1.7:
 	* libfaad/bits.h 1.7:
 	* libfaad/rvlc_scale_factors.c 1.2:
@@ -6,6 +1374,9 @@
 	* plugins/in_mp4/in_mp4.c 1.12:
 		RVLC ER tool finished
 
+	* libfaad/syntax.c 1.23:
+		Removed useless duplication of code
+
 	* AUTHORS 1.2:
 	* NEWS 1.2:
 	* README 1.3:
@@ -18,7 +1389,6 @@
 		Updates for release
 
 2002-08-05  menno
-	* common/libsndfile/Win32/libsndfile.dsp 1.3:
 	* frontend/main.c 1.17:
 	* libfaad/bits.c 1.6:
 	* libfaad/bits.h 1.6:
@@ -33,112 +1403,6 @@
 		RVLC bitstream reading working, what's left now is the decoding.
 
 2002-07-25  menno
-	* common/libsndfile/AUTHORS 1.2:
-	* common/libsndfile/ChangeLog 1.2:
-	* common/libsndfile/MacOS/MacOS-readme.txt 1.2:
-	* common/libsndfile/MacOS/Makefile.am 1.2:
-	* common/libsndfile/MacOS/Makefile.in 1.2:
-	* common/libsndfile/MacOS/config.h 1.2:
-	* common/libsndfile/Makefile.am 1.2:
-	* common/libsndfile/Makefile.in 1.2:
-	* common/libsndfile/NEWS 1.2:
-	* common/libsndfile/README 1.2:
-	* common/libsndfile/TODO 1.2:
-	* common/libsndfile/Win32/Makefile.am 1.2:
-	* common/libsndfile/Win32/Makefile.in 1.2:
-	* common/libsndfile/Win32/Makefile.msvc 1.1:
-	* common/libsndfile/Win32/README-Win32.txt.old 1.2:
-	* common/libsndfile/Win32/config.h 1.2:
-	* common/libsndfile/Win32/libsndfile.def 1.1:
-	* common/libsndfile/Win32/libsndfile.dsp 1.2:
-	* common/libsndfile/Win32/unistd.h 1.2:
-	* common/libsndfile/acconfig.h 1.2:
-	* common/libsndfile/acinclude.m4 1.1:
-	* common/libsndfile/aclocal.m4 1.2:
-	* common/libsndfile/check_libsndfile.py 1.2:
-	* common/libsndfile/config.guess 1.2:
-	* common/libsndfile/config.sub 1.2:
-	* common/libsndfile/configure 1.2:
-	* common/libsndfile/configure.in 1.2:
-	* common/libsndfile/libsndfile.spec 1.2:
-	* common/libsndfile/libsndfile_version_convert.py 1.1:
-	* common/libsndfile/ltconfig 1.2:
-	* common/libsndfile/ltmain.sh 1.2:
-	* common/libsndfile/mkinstalldirs 1.2:
-	* common/libsndfile/reconf 1.2:
-	* common/libsndfile/sndfile.pc.in 1.1:
-	* common/libsndfile/src/G72x/Makefile.am 1.2:
-	* common/libsndfile/src/G72x/Makefile.in 1.2:
-	* common/libsndfile/src/G72x/g72x.c 1.2:
-	* common/libsndfile/src/G72x/g72x.h 1.2:
-	* common/libsndfile/src/G72x/g72x_test.c 1.1:
-	* common/libsndfile/src/G72x/private.h 1.2:
-	* common/libsndfile/src/GSM610/ChangeLog 1.2:
-	* common/libsndfile/src/GSM610/Makefile.am 1.2:
-	* common/libsndfile/src/GSM610/Makefile.in 1.2:
-	* common/libsndfile/src/GSM610/add.c 1.2:
-	* common/libsndfile/src/GSM610/code.c 1.2:
-	* common/libsndfile/src/GSM610/config.h 1.2:
-	* common/libsndfile/src/GSM610/decode.c 1.2:
-	* common/libsndfile/src/GSM610/gsm.h 1.2:
-	* common/libsndfile/src/GSM610/gsm_create.c 1.2:
-	* common/libsndfile/src/GSM610/gsm_decode.c 1.2:
-	* common/libsndfile/src/GSM610/gsm_destroy.c 1.2:
-	* common/libsndfile/src/GSM610/gsm_encode.c 1.2:
-	* common/libsndfile/src/GSM610/gsm_option.c 1.2:
-	* common/libsndfile/src/GSM610/long_term.c 1.2:
-	* common/libsndfile/src/GSM610/lpc.c 1.2:
-	* common/libsndfile/src/GSM610/preprocess.c 1.2:
-	* common/libsndfile/src/GSM610/private.h 1.2:
-	* common/libsndfile/src/GSM610/proto.h 1.2:
-	* common/libsndfile/src/GSM610/rpe.c 1.2:
-	* common/libsndfile/src/GSM610/short_term.c 1.2:
-	* common/libsndfile/src/GSM610/table.c 1.2:
-	* common/libsndfile/src/GSM610/unproto.h 1.2:
-	* common/libsndfile/src/Makefile.am 1.2:
-	* common/libsndfile/src/Makefile.in 1.2:
-	* common/libsndfile/src/aiff.c 1.2:
-	* common/libsndfile/src/alaw.c 1.2:
-	* common/libsndfile/src/au.c 1.2:
-	* common/libsndfile/src/au.h 1.2:
-	* common/libsndfile/src/au_g72x.c 1.2:
-	* common/libsndfile/src/command.c 1.1:
-	* common/libsndfile/src/common.c 1.2:
-	* common/libsndfile/src/common.h 1.2:
-	* common/libsndfile/src/config.h.in 1.2:
-	* common/libsndfile/src/double64.c 1.1:
-	* common/libsndfile/src/dwvw.c 1.1:
-	* common/libsndfile/src/file_io.c 1.1:
-	* common/libsndfile/src/float32.c 1.2:
-	* common/libsndfile/src/float_cast.h 1.1:
-	* common/libsndfile/src/floatcast.h 1.2:
-	* common/libsndfile/src/gsm610.c 1.1:
-	* common/libsndfile/src/ima_adpcm.c 1.1:
-	* common/libsndfile/src/ircam.c 1.2:
-	* common/libsndfile/src/ms_adpcm.c 1.1:
-	* common/libsndfile/src/nist.c 1.2:
-	* common/libsndfile/src/paf.c 1.2:
-	* common/libsndfile/src/pcm.c 1.2:
-	* common/libsndfile/src/raw.c 1.2:
-	* common/libsndfile/src/rx2.c 1.1:
-	* common/libsndfile/src/samplitude.c 1.2:
-	* common/libsndfile/src/sd2.c 1.1:
-	* common/libsndfile/src/sf_command.h 1.1:
-	* common/libsndfile/src/sfendian.h 1.2:
-	* common/libsndfile/src/sndfile.c 1.2:
-	* common/libsndfile/src/sndfile.h 1.2:
-	* common/libsndfile/src/svx.c 1.2:
-	* common/libsndfile/src/txw.c 1.1:
-	* common/libsndfile/src/ulaw.c 1.2:
-	* common/libsndfile/src/voc.c 1.2:
-	* common/libsndfile/src/w64.c 1.1:
-	* common/libsndfile/src/wav.c 1.2:
-	* common/libsndfile/src/wav.h 1.2:
-	* common/libsndfile/src/wav_gsm610.c 1.2:
-	* common/libsndfile/src/wav_ima_adpcm.c 1.2:
-	* common/libsndfile/src/wav_ms_adpcm.c 1.2:
-	* common/libsndfile/src/wav_w64.c 1.1:
-	* common/libsndfile/src/wav_w64.h 1.1:
 	* frontend/audio.c 1.3:
 		Update to newest version of libsndfile library
 		(Somebody please check linux compilation)
--- a/common/mp4v2/mp4file_io.cpp
+++ b/common/mp4v2/mp4file_io.cpp
@@ -119,15 +119,15 @@
 	if (m_memoryBuffer == NULL) {
 #ifndef USE_FILE_CALLBACKS
 		if (fread(pBytes, 1, numBytes, pFile) != numBytes) {
-			if (numBytes == 0) {
-#else
-		if (m_MP4fread(pBytes, numBytes, m_userData) != numBytes) {
 			if (feof(pFile)) {
-#endif
 				throw new MP4Error(
 					"not enough bytes, reached end-of-file",
 					"MP4ReadBytes");
 			} else {
+#else
+		if (m_MP4fread(pBytes, numBytes, m_userData) != numBytes) {
+            {
+#endif
 				throw new MP4Error(errno, "MP4ReadBytes");
 			}
 		}
--- a/libfaad/Makefile.am
+++ b/libfaad/Makefile.am
@@ -18,3 +18,4 @@
 
 
 AM_CFLAGS = -O2
+AM_LDFLAGS = -lm
--- a/libfaad/fixed.h
+++ b/libfaad/fixed.h
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: fixed.h,v 1.7 2003/05/16 08:31:12 menno Exp $
+** $Id: fixed.h,v 1.8 2003/06/19 21:20:59 menno Exp $
 **/
 
 #ifndef __FIXED_H__
@@ -47,7 +47,13 @@
     _asm {
         mov eax,A
         imul B
+#if 0
         shrd eax,edx,REAL_BITS
+#else
+        shr eax,REAL_BITS
+        shl edx,(32-REAL_BITS)
+        or eax,edx
+#endif
     }
 }
 
@@ -57,7 +63,13 @@
     _asm {
         mov eax,A
         imul B
+#if 0
         shrd eax,edx,COEF_BITS
+#else
+        shr eax,COEF_BITS
+        shl edx,(32-COEF_BITS)
+        or eax,edx
+#endif
     }
 }
 
@@ -67,7 +79,13 @@
     _asm {
         mov eax,A
         imul B
+#if 0
         shrd eax,edx,COEF_BITS
+#else
+        shr eax,COEF_BITS
+        shl edx,(32-COEF_BITS)
+        or eax,edx
+#endif
     }
 }
 
--- a/plugins/foo_mp4/foo_mp4.cpp
+++ b/plugins/foo_mp4/foo_mp4.cpp
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: foo_mp4.cpp,v 1.32 2003/06/07 11:06:38 menno Exp $
+** $Id: foo_mp4.cpp,v 1.33 2003/06/19 21:20:59 menno Exp $
 **/
 
 #include <mp4.h>
@@ -27,15 +27,24 @@
 #include "foobar2000/SDK/componentversion.h"
 #include "foobar2000/SDK/tagread.h"
 
+//#define DBG_OUT(A) OutputDebugString(A)
+#define DBG_OUT(A)
+
+#if 0
 char *STRIP_REVISION(const char *str)
 {
     char *tmp = strchr(str, ' ');
-    tmp[strlen(tmp)-2] = '\0';
+    int len = lstrlen(tmp)-2;
+    if (len > 0 && tmp)
+        tmp[len] = '\0';
+    else
+        tmp = "000";
     return tmp;
 }
+#endif
 
 DECLARE_COMPONENT_VERSION ("MPEG-4 AAC decoder",
-                           STRIP_REVISION("$Revision: 1.32 $"),
+                           "$Revision: 1.33 $",
                            "Based on FAAD2 v" FAAD2_VERSION "\nCopyright (C) 2002-2003 http://www.audiocoding.com" );
 
 class input_mp4 : public input
@@ -343,11 +352,13 @@
     static unsigned __int32 open_cb(const char *pName,
         const char *mode, void *userData)
     {
+        DBG_OUT("open_cb");
         return 1;
     }
 
     static void close_cb(void *userData)
     {
+        DBG_OUT("close_cb");
         return;
     }
 
@@ -354,6 +365,7 @@
     static unsigned __int32 read_cb(void *pBuffer, unsigned int nBytesToRead,
         void *userData)
     {
+        DBG_OUT("read_cb");
         reader *r = (reader*)userData;
         return r->read(pBuffer, nBytesToRead);
     }
@@ -361,6 +373,7 @@
     static unsigned __int32 write_cb(void *pBuffer, unsigned int nBytesToWrite,
         void *userData)
     {
+        DBG_OUT("write_cb");
         reader *r = (reader*)userData;
         return r->write(pBuffer, nBytesToWrite);
     }
@@ -367,6 +380,7 @@
 
     static __int64 getpos_cb(void *userData)
     {
+        DBG_OUT("getpos_cb");
         reader *r = (reader*)userData;
         return r->get_position();
     }
@@ -373,6 +387,7 @@
 
     static __int32 setpos_cb(unsigned __int32 pos, void *userData)
     {
+        DBG_OUT("setpos_cb");
         reader *r = (reader*)userData;
         return !(r->seek(pos));
     }
@@ -379,6 +394,7 @@
 
     static __int64 filesize_cb(void *userData)
     {
+        DBG_OUT("filesize_cb");
         reader *r = (reader*)userData;
         return r->get_length();
     }
--- a/plugins/xmms/src/libaac.c
+++ b/plugins/xmms/src/libaac.c
@@ -161,7 +161,7 @@
     unsigned char       *buffer = 0;
     unsigned long       bufferconsumed = 0;
     unsigned long       samplerate = 0;
-    char            channels;
+    unsigned char       channels;
     unsigned long       buffervalid = 0;
     TitleInput      *input;
     char            *temp = g_strdup(filename);