shithub: aacdec

Download patch

ref: 42c2fe93a7e7ab1cc1e6b8578834355cefd0c7f1
parent: 6dfe72f142947c22f7f9f7c8e4894c3f35657656
author: menno <menno>
date: Fri Feb 6 05:23:28 EST 2004

Final changes for version 2.0

--- a/ChangeLog
+++ /dev/null
@@ -1,2453 +1,0 @@
-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:
-	* libfaad/rvlc_scale_factors.h 1.2:
-	* 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:
-	* aacDECdrop/aacDECdrop/aacDECdrop.dsp 1.3:
-	* aacDECdrop/decode.c 1.5:
-	* frontend/main.c 1.18:
-	* include/faad.h 1.9:
-	* libfaad/Makefile.am 1.7:
-	* libfaad/libfaad2_dll.dsp 1.7:
-		Updates for release
-
-2002-08-05  menno
-	* frontend/main.c 1.17:
-	* libfaad/bits.c 1.6:
-	* libfaad/bits.h 1.6:
-	* libfaad/decoder.c 1.18:
-	* libfaad/filtbank.c 1.11:
-	* libfaad/libfaad.dsp 1.13:
-	* libfaad/mp4.c 1.9:
-	* libfaad/rvlc_scale_factors.c 1.1:
-	* libfaad/rvlc_scale_factors.h 1.1:
-	* libfaad/syntax.c 1.21:
-	* libfaad/syntax.h 1.16:
-		RVLC bitstream reading working, what's left now is the decoding.
-
-2002-07-25  menno
-	* frontend/audio.c 1.3:
-		Update to newest version of libsndfile library
-		(Somebody please check linux compilation)
-
-	* common/mp4v2/API_CHANGES 1.1:
-	* common/mp4v2/Makefile.am 1.5:
-	* common/mp4v2/TODO 1.2:
-	* common/mp4v2/atom_mvhd.cpp 1.2:
-	* common/mp4v2/descriptors.cpp 1.2:
-	* common/mp4v2/descriptors.h 1.2:
-	* common/mp4v2/isma.cpp 1.3:
-	* common/mp4v2/libmp4v2.dsp 1.3:
-	* common/mp4v2/libmp4v260.dsp 1.3:
-	* common/mp4v2/libmp4v2_st.dsp 1.3:
-	* common/mp4v2/libmp4v2_st60.dsp 1.3:
-	* common/mp4v2/mp4.cpp 1.3:
-	* common/mp4v2/mp4.h 1.3:
-	* common/mp4v2/mp4descriptor.cpp 1.2:
-	* common/mp4v2/mp4file.cpp 1.3:
-	* common/mp4v2/mp4file.h 1.3:
-	* common/mp4v2/mp4file_io.cpp 1.2:
-	* common/mp4v2/mp4info.cpp 1.1:
-	* common/mp4v2/mp4property.cpp 1.2:
-	* common/mp4v2/mp4property.h 1.3:
-	* common/mp4v2/mp4track.cpp 1.2:
-	* common/mp4v2/mp4track.h 1.2:
-	* common/mp4v2/mp4util.cpp 1.2:
-	* common/mp4v2/mp4util.h 1.2:
-	* common/mp4v2/rtphint.cpp 1.2:
-	* common/mp4v2/systems.h 1.6:
-	* common/mp4v2/win32_ver.h 1.3:
-		Update to newest version of mp4v2 library
-		(Somebody please check linux compilation)
-
-	* aacDECdrop/audio.c 1.3:
-	* aacDECdrop/decode.c 1.4:
-		made aacDECdrop compilable again
-
-	* plugins/in_mp4/in_mp4.c 1.11:
-		winamp mp4 plugin updated
-
-	* common/mp4v2/Makefile.am 1.6:
-	* configure.in 1.4:
-	* libfaad/Makefile.am 1.6:
-		Fixed linux compilation
-
-	* configure.in 1.5:
-	* frontend/Makefile.am 1.3:
-		Linux compilation fixed
-
-2002-07-24  menno
-	* libfaad/libfaad2_dll.dsp 1.6:
-	* libfaad/syntax.h 1.15:
-		Fixed bug with array size
-		Updated DLL project files
-
-2002-07-14  menno
-	* libfaad/Makefile.am 1.5:
-	* libfaad/cfft.c 1.1:
-	* libfaad/cfft.h 1.1:
-	* libfaad/common.h 1.14:
-	* libfaad/libfaad.dsp 1.12:
-	* libfaad/mdct.c 1.11:
-	* libfaad/mdct.h 1.9:
-		Changed fft; use of the FFTW library is not needed anymore, but
-		stays as an option
-
-2002-07-09  menno
-	* libfaad/reordered_spectral_data.c 1.4:
-		Fixes in reordered spectral decoding
-
-	* configure.in 1.3:
-		Configure fix
-
-2002-06-19  menno
-	* libfaad/Makefile.am 1.4:
-		Fixes for Linux compilation
-
-2002-06-17  menno
-	* libfaad/filtbank.c 1.10:
-		Fixes for 960 sample transform
-
-2002-06-15  menno
-	* libfaad/error.c 1.5:
-	* libfaad/huffman.h 1.9:
-	* libfaad/syntax.c 1.20:
-		Better bitstream error handling
-
-	* include/faad.h 1.8:
-	* libfaad/Makefile.am 1.3:
-	* libfaad/decoder.c 1.17:
-	* libfaad/huffman.h 1.8:
-	* libfaad/reordered_spectral_data.c 1.3:
-	* libfaad/syntax.c 1.19:
-	* libfaad/syntax.h 1.14:
-		Changes for DRM
-
-2002-06-13  menno
-	* libfaad/libfaad.dsp 1.11:
-	* libfaad/reordered_spectral_data.c 1.1:
-	* libfaad/syntax.c 1.17:
-	* libfaad/syntax.h 1.12:
-		added HCR Error Resilience tool
-		(great thanks to Alexander Kurpiers)
-
-	* libfaad/libfaad2_dll.dsp 1.5:
-		Updated DLL project files
-
-	* frontend/main.c 1.16:
-	* include/faad.h 1.7:
-	* libfaad/decoder.c 1.16:
-	* libfaad/decoder.h 1.7:
-	* libfaad/filtbank.c 1.9:
-	* libfaad/filtbank.h 1.7:
-	* libfaad/ic_predict.c 1.6:
-	* libfaad/ic_predict.h 1.4:
-	* libfaad/is.c 1.6:
-	* libfaad/is.h 1.4:
-	* libfaad/lt_predict.c 1.6:
-	* libfaad/mp4.c 1.8:
-	* libfaad/mp4.h 1.5:
-	* libfaad/ms.c 1.3:
-	* libfaad/ms.h 1.3:
-	* libfaad/pns.c 1.7:
-	* libfaad/pns.h 1.5:
-	* libfaad/reordered_spectral_data.c 1.2:
-	* libfaad/specrec.c 1.8:
-	* libfaad/specrec.h 1.5:
-	* libfaad/syntax.c 1.18:
-	* libfaad/syntax.h 1.13:
-	* libfaad/tns.c 1.12:
-	* libfaad/tns.h 1.4:
-		Included decoding capability of 960 sample frame sizes
-
-	* common/mp4v2/acconfig.h 1.1:
-	* common/mp4v2/configure.in 1.3:
-	* common/mp4v2/systems.h 1.5:
-		mp4v2 compilation fix
-
-2002-06-03  menno
-	* libfaad/ic_predict.c 1.5:
-		Bugfix in predictor state resetting when PNS is used
-
-2002-05-31  menno
-	* libfaad/codebook/hcb.h 1.3:
-	* libfaad/huffman.h 1.7:
-	* libfaad/syntax.c 1.16:
-	* libfaad/syntax.h 1.11:
-		VCB11 fix
-
-	* libfaad/huffman.h 1.6:
-	* libfaad/syntax.c 1.15:
-	* libfaad/syntax.h 1.10:
-		More ER updates
-		- VCB11 now working
-		- temporarily added gain_control_data() so that the conformance files can be decoded
-
-2002-05-30  menno
-	* aacDECdrop/decode.c 1.3:
-	* plugins/in_mp4/in_mp4.c 1.10:
-		Small update after latest changes in libfaad2
-
-	* frontend/main.c 1.15:
-	* include/faad.h 1.6:
-	* libfaad/common.h 1.12:
-	* libfaad/decoder.c 1.14:
-	* libfaad/decoder.h 1.6:
-	* libfaad/mp4.c 1.6:
-	* libfaad/mp4.h 1.4:
-	* libfaad/syntax.c 1.13:
-	* libfaad/syntax.h 1.8:
-		More ER stuff
-		Still not working at all, but it is compilable now
-
-	* libfaad/libfaad2_dll.dsp 1.4:
-		DLL project file updated
-
-	* libfaad/common.h 1.13:
-	* libfaad/decoder.c 1.15:
-	* libfaad/mp4.c 1.7:
-	* libfaad/syntax.c 1.14:
-	* libfaad/syntax.h 1.9:
-	* libfaad/tns.c 1.11:
-		More updates for ER
-
-2002-05-24  menno
-	* libfaad/common.h 1.11:
-	* libfaad/drc.c 1.5:
-	* libfaad/filtbank.c 1.8:
-	* libfaad/ic_predict.c 1.4:
-	* libfaad/is.c 1.5:
-	* libfaad/lt_predict.c 1.5:
-	* libfaad/mdct.c 1.10:
-	* libfaad/pns.c 1.6:
-	* libfaad/specrec.c 1.7:
-	* libfaad/tns.c 1.10:
-		My latest changes
-		- bugfix in filtbank.c
-		- start work for fixed point operation
-
-2002-05-14  menno
-	* libfaad/tns.c 1.9:
-		Fixed a nasty bug in tns decoding
-
-2002-05-02  menno
-	* common/Makefile.am 1.1:
-		linux compilation fixed
-
-2002-05-01  menno
-	* Makefile.am 1.2:
-	* README.linux 1.1:
-	* common/mp4v2/Makefile.am 1.4:
-	* common/mp4v2/configure.in 1.2:
-	* common/mp4v2/systems.h 1.4:
-	* configure.in 1.2:
-	* frontend/Makefile.am 1.2:
-	* libfaad/Makefile.am 1.2:
-	* libfaad/common.h 1.10:
-	* libfaad/output.h 1.4:
-		Fixes for compilation under linux
-
-2002-04-23  menno
-	* libfaad/mdct.c 1.9:
-	* libfaad/mdct.h 1.8:
-	* libfaad/sbr_dec.c 1.3:
-	* libfaad/sbr_huff.c 1.3:
-	* libfaad/sbr_huff.h 1.2:
-	* libfaad/sbr_syntax.c 1.4:
-	* libfaad/sbr_syntax.h 1.3:
-		More updates for SBR
-
-2002-04-21  menno
-	* libfaad/common.h 1.9:
-	* libfaad/mdct.c 1.8:
-	* libfaad/mdct.h 1.7:
-	* libfaad/sbr_dec.c 1.2:
-	* libfaad/sbr_huff.c 1.2:
-	* libfaad/sbr_qmf.c 1.2:
-	* libfaad/sbr_qmf.h 1.2:
-	* libfaad/sbr_syntax.c 1.3:
-		Finished QMF filterbanks for SBR
-
-2002-04-20  menno
-	* libfaad/common.c 1.1:
-	* libfaad/common.h 1.7:
-	* libfaad/libfaad.dsp 1.9:
-	* libfaad/sbr_huff.c 1.1:
-	* libfaad/sbr_huff.h 1.1:
-	* libfaad/sbr_qmf.c 1.1:
-	* libfaad/sbr_qmf.h 1.1:
-	* libfaad/sbr_syntax.c 1.1:
-	* libfaad/sbr_syntax.h 1.1:
-	* libfaad/syntax.c 1.12:
-	* libfaad/syntax.h 1.7:
-		Added beginning of SBR decoding
-		(definately not compilable yet :)
-
-	* libfaad/common.h 1.8:
-	* libfaad/libfaad.dsp 1.10:
-	* libfaad/sbr_dec.c 1.1:
-	* libfaad/sbr_dec.h 1.1:
-	* libfaad/sbr_syntax.c 1.2:
-	* libfaad/sbr_syntax.h 1.2:
-		update in SBR
-		bitstream reading is finished now except for the huffman decoding
-
-2002-04-18  menno
-	* libfaad/error.c 1.4:
-	* libfaad/syntax.c 1.11:
-		Some more ER stuff
-
-2002-04-14  menno
-	* aacDECdrop/Script.rc 1.2:
-	* aacDECdrop/audio.c 1.2:
-	* aacDECdrop/audio.h 1.2:
-	* aacDECdrop/decode.c 1.2:
-	* aacDECdrop/decthread.c 1.2:
-	* aacDECdrop/main.c 1.2:
-	* aacDECdrop/misc.c 1.2:
-	* aacDECdrop/misc.h 1.2:
-	* aacDECdrop/resource.h 1.2:
-		code update
-
-2002-04-08  menno
-	* aacDECdrop/aacDECdrop/aacDECdrop.dsp 1.2:
-		Updated project file for aacDECdrop
-
-2002-04-07  menno
-	* libfaad/common.h 1.6:
-	* libfaad/filtbank.c 1.7:
-	* libfaad/filtbank.h 1.6:
-	* libfaad/libfaad.dsp 1.8:
-	* libfaad/mdct.c 1.7:
-	* libfaad/mdct.h 1.6:
-	* libfaad/mp4.c 1.5:
-	* libfaad/syntax.c 1.10:
-		Complete new (I)MDCT
-		and some work on error resilience, but not nearly finished yet
-
-2002-03-28  menno
-	* common/id3lib/zlib/include/deflate.h 1.2:
-	* common/id3lib/zlib/include/infblock.h 1.2:
-	* common/id3lib/zlib/include/infcodes.h 1.2:
-	* common/id3lib/zlib/include/inffast.h 1.2:
-	* common/id3lib/zlib/include/inftrees.h 1.2:
-	* common/id3lib/zlib/include/infutil.h 1.2:
-	* common/id3lib/zlib/include/zconf.h 1.2:
-	* common/id3lib/zlib/include/zlib.h 1.2:
-	* common/id3lib/zlib/include/zutil.h 1.2:
-	* common/id3lib/zlib/src/adler32.c 1.2:
-	* common/id3lib/zlib/src/compress.c 1.2:
-	* common/id3lib/zlib/src/crc32.c 1.2:
-	* common/id3lib/zlib/src/deflate.c 1.2:
-	* common/id3lib/zlib/src/gzio.c 1.2:
-	* common/id3lib/zlib/src/infblock.c 1.2:
-	* common/id3lib/zlib/src/infcodes.c 1.2:
-	* common/id3lib/zlib/src/inffast.c 1.2:
-	* common/id3lib/zlib/src/inflate.c 1.2:
-	* common/id3lib/zlib/src/inftrees.c 1.2:
-	* common/id3lib/zlib/src/infutil.c 1.2:
-	* common/id3lib/zlib/src/trees.c 1.2:
-	* common/id3lib/zlib/src/uncompr.c 1.2:
-	* common/id3lib/zlib/src/zutil.c 1.2:
-		Updated ZLib version to avoid possible security bug
-
-2002-03-27  menno
-	* libfaad/common.h 1.5:
-	* libfaad/filtbank.c 1.6:
-	* libfaad/mdct.c 1.6:
-	* libfaad/tns.c 1.8:
-		Bugfix for non-meaningful window transitions
-
-2002-03-16  menno
-	* libfaad/common.h 1.3:
-	* libfaad/data.c 1.4:
-	* libfaad/data.h 1.4:
-	* libfaad/decoder.c 1.12:
-	* libfaad/decoder.h 1.5:
-	* libfaad/drc.c 1.4:
-	* libfaad/filtbank.c 1.5:
-	* libfaad/filtbank.h 1.5:
-	* libfaad/ic_predict.c 1.3:
-	* libfaad/ic_predict.h 1.3:
-	* libfaad/is.c 1.4:
-	* libfaad/lt_predict.c 1.4:
-	* libfaad/lt_predict.h 1.4:
-	* libfaad/mdct.c 1.5:
-	* libfaad/mdct.h 1.5:
-	* libfaad/mp4.c 1.4:
-	* libfaad/output.c 1.6:
-	* libfaad/pns.c 1.5:
-	* libfaad/specrec.c 1.6:
-	* libfaad/specrec.h 1.4:
-	* libfaad/syntax.c 1.9:
-	* libfaad/tns.c 1.6:
-		Delay fixed in LD decoding
-		Small performance updates
-		More compile options - can now be compiled as LC only decoder for example
-
-	* aacDECdrop/Script.rc 1.1:
-	* aacDECdrop/aacDECdrop/aacDECdrop.dsp 1.1:
-	* aacDECdrop/aacDECdrop/aacDECdrop.dsw 1.1:
-	* aacDECdrop/audio.c 1.1:
-	* aacDECdrop/audio.h 1.1:
-	* aacDECdrop/decode.c 1.1:
-	* aacDECdrop/decode.h 1.1:
-	* aacDECdrop/decthread.c 1.1:
-	* aacDECdrop/decthread.h 1.1:
-	* aacDECdrop/main.c 1.1:
-	* aacDECdrop/misc.c 1.1:
-	* aacDECdrop/misc.h 1.1:
-	* aacDECdrop/resource.h 1.1:
-	* aacDECdrop/resource/AAC01.bmp 1.1:
-	* aacDECdrop/resource/AAC01.ico 1.1:
-	* aacDECdrop/resource/AAC02.bmp 1.1:
-	* aacDECdrop/resource/AAC03.bmp 1.1:
-	* aacDECdrop/resource/AAC04.bmp 1.1:
-	* aacDECdrop/resource/AAC05.bmp 1.1:
-	* aacDECdrop/resource/AAC06.bmp 1.1:
-	* aacDECdrop/resource/AAC07.bmp 1.1:
-	* aacDECdrop/resource/AAC08.bmp 1.1:
-	* aacDECdrop/wave_out.c 1.1:
-	* aacDECdrop/wave_out.h 1.1:
-	* libfaad/decoder.c 1.13:
-	* libfaad/tns.c 1.7:
-		Added aacDECdrop made by John33
-		Thanks a lot!
-
-	* libfaad/common.h 1.4:
-	* libfaad/output.c 1.7:
-		fix in 32 bit output
-
-	* libfaad/output.c 1.8:
-	* libfaad/output.c 1.9:
-		fix in output
-
-2002-03-16  vividos
-	* frontend/faad.dsp 1.4:
-	* frontend/faad.dsw 1.3:
-	* libfaad/libfaad.dsp 1.7:
-	* libfaad/libfaad.dsw 1.2:
-	* libfaad/libfaad2_dll.dsp 1.2:
-	* libfaad/libfaad2_dll.dsw 1.2:
-	* plugins/in_mp4/in_mp4.dsp 1.2:
-	* plugins/in_mp4/in_mp4.dsw 1.2:
-	* plugins/winamp/in_faad.dsp 1.2:
-	* plugins/winamp/in_faad.dsw 1.2:
-	* plugins/winamp3/cnv_aacpcm.dsp 1.4:
-	* plugins/winamp3/cnv_aacpcm.dsw 1.2:
-		converted to cr-lf line endings to get them to work
-
-	* libfaad/libfaad2_dll.dsp 1.3:
-		intermediate build files are now placed in the correct folders
-
-2002-02-27  menno
-	* libfaad/tns.c 1.5:
-		Fixed serious bug for LD
-
-2002-02-25  menno
-	* libfaad/libfaad2.def 1.1:
-	* libfaad/libfaad2_dll.dsp 1.1:
-	* libfaad/libfaad2_dll.dsw 1.1:
-		Added DLL project files
-		thanks to Michael Fink
-
-	* libfaad/decoder.c 1.11:
-		Making it possible to read RAW AAC LD files
-		There is no use for this except debugging an encoder
-
-	* common/mp4v2/Makefile.am 1.3:
-	* common/mp4v2/isma.cpp 1.2:
-	* common/mp4v2/libmp4v2.dsp 1.2:
-	* common/mp4v2/libmp4v260.dsp 1.2:
-	* common/mp4v2/libmp4v2_st.dsp 1.2:
-	* common/mp4v2/libmp4v2_st60.dsp 1.2:
-	* common/mp4v2/mp4.cpp 1.2:
-	* common/mp4v2/mp4.h 1.2:
-	* common/mp4v2/mp4file.cpp 1.2:
-	* common/mp4v2/mp4file.h 1.2:
-	* common/mp4v2/mp4property.h 1.2:
-	* common/mp4v2/mpeg4ip.h 1.2:
-	* common/mp4v2/systems.h 1.3:
-	* common/mp4v2/win32_ver.h 1.2:
-	* frontend/main.c 1.14:
-	* include/faad.h 1.5:
-	* libfaad/data.c 1.3:
-	* libfaad/data.h 1.3:
-	* libfaad/decoder.c 1.10:
-	* libfaad/decoder.h 1.4:
-	* libfaad/error.c 1.3:
-	* libfaad/filtbank.c 1.4:
-	* libfaad/filtbank.h 1.4:
-	* libfaad/lt_predict.c 1.3:
-	* libfaad/lt_predict.h 1.3:
-	* libfaad/mdct.c 1.4:
-	* libfaad/mdct.h 1.4:
-	* libfaad/mp4.c 1.3:
-	* libfaad/mp4.h 1.3:
-	* libfaad/output.c 1.5:
-	* libfaad/output.h 1.3:
-	* libfaad/specrec.c 1.5:
-	* libfaad/specrec.h 1.3:
-	* libfaad/syntax.c 1.8:
-	* libfaad/syntax.h 1.6:
-	* libfaad/tns.c 1.4:
-	* libfaad/tns.h 1.3:
-	* plugins/in_mp4/in_mp4.c 1.9:
-		Added support for LD object type (Low Delay), only files
-		without Error Resilience turned on can be decoded right now.
-
-2002-02-20  menno
-	* libfaad/common.h 1.2:
-	* libfaad/decoder.c 1.9:
-	* libfaad/drc.c 1.3:
-	* libfaad/filtbank.c 1.3:
-	* libfaad/filtbank.h 1.3:
-	* libfaad/is.c 1.3:
-	* libfaad/mdct.c 1.3:
-	* libfaad/mdct.h 1.3:
-	* libfaad/output.c 1.4:
-	* libfaad/pns.c 1.4:
-	* libfaad/specrec.c 1.4:
-	* libfaad/tns.c 1.3:
-		- Nicer defines in common.h
-		- 1% speedup in MDCT
-
-	* cnv_aacpcm.nsi 1.2:
-	* in_faad.nsi 1.2:
-	* in_mp4.nsi 1.2:
-		updated install scripts
-
-2002-02-19  menno
-	* plugins/winamp3/aacpcm.cpp 1.2:
-		Little fixes for MSVC
-
-2002-02-18  menno
-	* TODO 1.3:
-	* frontend/faad.dsp 1.3:
-	* frontend/main.c 1.13:
-	* include/faad.h 1.4:
-	* libfaad/analysis.h 1.2:
-	* libfaad/bits.c 1.5:
-	* libfaad/bits.h 1.5:
-	* libfaad/codebook/hcb.h 1.2:
-	* libfaad/codebook/hcb_1.c 1.2:
-	* libfaad/codebook/hcb_10.c 1.2:
-	* libfaad/codebook/hcb_11.c 1.2:
-	* libfaad/codebook/hcb_2.c 1.2:
-	* libfaad/codebook/hcb_3.c 1.2:
-	* libfaad/codebook/hcb_4.c 1.2:
-	* libfaad/codebook/hcb_5.c 1.2:
-	* libfaad/codebook/hcb_6.c 1.2:
-	* libfaad/codebook/hcb_7.c 1.2:
-	* libfaad/codebook/hcb_8.c 1.2:
-	* libfaad/codebook/hcb_9.c 1.2:
-	* libfaad/codebook/hcb_sf.c 1.2:
-	* libfaad/common.h 1.1:
-	* libfaad/data.c 1.2:
-	* libfaad/data.h 1.2:
-	* libfaad/decoder.c 1.8:
-	* libfaad/decoder.h 1.3:
-	* libfaad/drc.c 1.2:
-	* libfaad/drc.h 1.2:
-	* libfaad/error.c 1.2:
-	* libfaad/error.h 1.2:
-	* libfaad/filtbank.c 1.2:
-	* libfaad/filtbank.h 1.2:
-	* libfaad/huffman.h 1.5:
-	* libfaad/ic_predict.c 1.2:
-	* libfaad/ic_predict.h 1.2:
-	* libfaad/is.c 1.2:
-	* libfaad/is.h 1.3:
-	* libfaad/kbd_win.h 1.2:
-	* libfaad/libfaad.dsp 1.6:
-	* libfaad/lt_predict.c 1.2:
-	* libfaad/lt_predict.h 1.2:
-	* libfaad/mdct.c 1.2:
-	* libfaad/mdct.h 1.2:
-	* libfaad/mp4.c 1.2:
-	* libfaad/mp4.h 1.2:
-	* libfaad/ms.c 1.2:
-	* libfaad/ms.h 1.2:
-	* libfaad/output.c 1.3:
-	* libfaad/output.h 1.2:
-	* libfaad/pns.c 1.3:
-	* libfaad/pns.h 1.4:
-	* libfaad/pulse.c 1.2:
-	* libfaad/pulse.h 1.2:
-	* libfaad/specrec.c 1.3:
-	* libfaad/specrec.h 1.2:
-	* libfaad/syntax.c 1.7:
-	* libfaad/syntax.h 1.5:
-	* libfaad/tns.c 1.2:
-	* libfaad/tns.h 1.2:
-	* plugins/in_mp4/in_mp4.c 1.8:
-	* plugins/winamp/in_faad.c 1.3:
-	* plugins/winamp3/cnv_aacpcm.dsp 1.3:
-		some restructuring -> better cache performance and lower memory usage
-		library interface changed a bit so programs using this should change a bit
-
-2002-02-17  menno
-	* plugins/winamp3/cnv_aacpcm.cpp 1.2:
-	* plugins/winamp3/cnv_aacpcm.dsp 1.2:
-	* plugins/winamp3/cnv_aacpcm.h 1.2:
-		Winamp3 plugin updated for Winamp3 beta 3
-
-	* cnv_aacpcm.nsi 1.1:
-		Winamp3 plugin install script
-
-2002-02-15  menno
-	* libfaad/bits.c 1.4:
-	* libfaad/bits.h 1.4:
-	* libfaad/codebook/hcb.h 1.1:
-	* libfaad/codebook/hcb_1.c 1.1:
-	* libfaad/codebook/hcb_10.c 1.1:
-	* libfaad/codebook/hcb_11.c 1.1:
-	* libfaad/codebook/hcb_2.c 1.1:
-	* libfaad/codebook/hcb_3.c 1.1:
-	* libfaad/codebook/hcb_4.c 1.1:
-	* libfaad/codebook/hcb_5.c 1.1:
-	* libfaad/codebook/hcb_6.c 1.1:
-	* libfaad/codebook/hcb_7.c 1.1:
-	* libfaad/codebook/hcb_8.c 1.1:
-	* libfaad/codebook/hcb_9.c 1.1:
-	* libfaad/codebook/hcb_sf.c 1.1:
-	* libfaad/huffman.c 1.3:
-	* libfaad/huffman.h 1.4:
-	* libfaad/libfaad.dsp 1.5:
-		- complete new huffman decoding routines
-		- complete new bitstream reading routines
-
-2002-02-11  menno
-	* common/faad/id3v2tag.c 1.3:
-		Fixed ID3 title bug
-
-	* libfaad/specrec.c 1.2:
-	* libfaad/syntax.c 1.6:
-		Added recovery from synchronisation errors
-
-2002-02-08  menno
-	* plugins/xmms/COPYING 1.1:
-	* plugins/xmms/Makefile 1.1:
-	* plugins/xmms/README 1.1:
-	* plugins/xmms/aac-XMMS.c 1.1:
-		added XMMS plugin to CVS
-
-2002-02-04  menno
-	* frontend/main.c 1.12:
-		Output file option bug fixed
-
-2002-01-27  menno
-	* libfaad/decoder.c 1.7:
-		bugfix: variables not initialized before possible usage
-
-2002-01-26  menno
-	* in_faad.nsi 1.1:
-	* in_mp4.nsi 1.1:
-		Install scripts for winamp plugins
-
-2002-01-25  menno
-	* Makefile.am 1.1:
-	* bootstrap 1.1:
-	* configure.in 1.1:
-	* frontend/Makefile.am 1.1:
-	* libfaad/Makefile.am 1.1:
-	* libfaad/syntax.h 1.4:
-		Linux MAKE stuff and Linux fix
-
-	* plugins/in_mp4/in_mp4.c 1.7:
-		long long changed to long
-
-	* libfaad/output.c 1.2:
-	* libfaad/pns.c 1.2:
-	* libfaad/pns.h 1.3:
-	* plugins/in_mp4/in_mp4.rc 1.2:
-		Small PNS cleanup
-		faster 32 bit rounding
-
-2002-01-24  menno
-	* common/faad/aacinfo.c 1.2:
-		Always calculate filelength
-
-	* plugins/in_mp4/in_mp4.c 1.6:
-		time calculation fixed
-
-	* README 1.2:
-	* TODO 1.2:
-		Small updates
-
-2002-01-23  menno
-	* plugins/in_mp4/in_mp4.c 1.4:
-		mp4v2 doesn't seem to be reentrant
-		mp4 plugin looks stable now, although songlength is only known when playing the file
-
-	* frontend/main.c 1.11:
-	* plugins/in_mp4/in_mp4.c 1.5:
-		bugfix
-
-2002-01-22  menno
-	* libfaad/analysis.h 1.1:
-	* libfaad/bits.h 1.3:
-	* libfaad/debug.h 1.2:
-	* libfaad/libfaad.dsp 1.4:
-	* libfaad/syntax.c 1.5:
-		File renamed
-
-	* plugins/in_mp4/in_mp4.c 1.3:
-		strange value for thread priority
-
-2002-01-21  menno
-	* plugins/winamp3/aacpcm.cpp 1.1:
-	* plugins/winamp3/aacpcm.h 1.1:
-	* plugins/winamp3/cnv_aacpcm.cpp 1.1:
-	* plugins/winamp3/cnv_aacpcm.dsp 1.1:
-	* plugins/winamp3/cnv_aacpcm.dsw 1.1:
-	* plugins/winamp3/cnv_aacpcm.h 1.1:
-		Winamp3 plugin added
-
-	* plugins/in_mp4/in_mp4.c 1.2:
-	* plugins/winamp/in_faad.c 1.2:
-		Bugfix for config reading
-
-	* frontend/main.c 1.10:
-		Better mp4 file configuration handling
-
-	* common/mp4v2/Makefile.am 1.2:
-	* common/mp4v2/bootstrap 1.1:
-	* common/mp4v2/configure.in 1.1:
-	* common/mp4v2/systems.h 1.2:
-	* frontend/audio.c 1.2:
-	* frontend/main.c 1.9:
-		Small changes for linux
-
-	* common/id3lib/.cvsignore 1.1:
-	* common/id3lib/AUTHORS 1.1:
-	* common/id3lib/COPYING 1.1:
-	* common/id3lib/ChangeLog 1.1:
-	* common/id3lib/HISTORY 1.1:
-	* common/id3lib/INSTALL 1.1:
-	* common/id3lib/Makefile.am 1.1:
-	* common/id3lib/Makefile.in 1.1:
-	* common/id3lib/NEWS 1.1:
-	* common/id3lib/README 1.1:
-	* common/id3lib/THANKS 1.1:
-	* common/id3lib/TODO 1.1:
-	* common/id3lib/acconfig 1.1:
-	* common/id3lib/acconfig.h 1.1:
-	* common/id3lib/aclocal.m4 1.1:
-	* common/id3lib/config.guess 1.1:
-	* common/id3lib/config.h.in 1.1:
-	* common/id3lib/config.h.win32.in 1.1:
-	* common/id3lib/config.sub 1.1:
-	* common/id3lib/config.win32 1.1:
-	* common/id3lib/configure 1.1:
-	* common/id3lib/configure.in 1.1:
-	* common/id3lib/id3lib.spec.in 1.1:
-	* common/id3lib/include/.cvsignore 1.1:
-	* common/id3lib/include/Makefile.am 1.1:
-	* common/id3lib/include/Makefile.in 1.1:
-	* common/id3lib/include/id3.h 1.1:
-	* common/id3lib/include/id3/.cvsignore 1.1:
-	* common/id3lib/include/id3/Makefile.am 1.1:
-	* common/id3lib/include/id3/Makefile.in 1.1:
-	* common/id3lib/include/id3/error.h 1.1:
-	* common/id3lib/include/id3/field.h 1.1:
-	* common/id3lib/include/id3/flags.h 1.1:
-	* common/id3lib/include/id3/frame.h 1.1:
-	* common/id3lib/include/id3/globals.h 1.1:
-	* common/id3lib/include/id3/header.h 1.1:
-	* common/id3lib/include/id3/header_frame.h 1.1:
-	* common/id3lib/include/id3/header_tag.h 1.1:
-	* common/id3lib/include/id3/int28.h 1.1:
-	* common/id3lib/include/id3/misc_support.h 1.1:
-	* common/id3lib/include/id3/sized_types.h 1.1:
-	* common/id3lib/include/id3/spec.h 1.1:
-	* common/id3lib/include/id3/tag.h 1.1:
-	* common/id3lib/include/id3/uint28.h 1.1:
-	* common/id3lib/include/id3/utils.h 1.1:
-	* common/id3lib/install-sh 1.1:
-	* common/id3lib/libprj/.cvsignore 1.1:
-	* common/id3lib/libprj/Makefile.am 1.1:
-	* common/id3lib/libprj/id3lib.dsp 1.1:
-	* common/id3lib/libprj/id3lib.dsw 1.1:
-	* common/id3lib/libtool 1.1:
-	* common/id3lib/ltconfig 1.1:
-	* common/id3lib/ltmain.sh 1.1:
-	* common/id3lib/m4/.cvsignore 1.1:
-	* common/id3lib/m4/Makefile.am 1.1:
-	* common/id3lib/m4/Makefile.in 1.1:
-	* common/id3lib/m4/lf_bash.m4 1.1:
-	* common/id3lib/m4/lf_cc.m4 1.1:
-	* common/id3lib/m4/lf_cxx.m4 1.1:
-	* common/id3lib/m4/lf_cxx_convenience.m4 1.1:
-	* common/id3lib/m4/lf_fortran.m4 1.1:
-	* common/id3lib/m4/lf_host_type.m4 1.1:
-	* common/id3lib/m4/lf_lisp.m4 1.1:
-	* common/id3lib/m4/lf_local.m4 1.1:
-	* common/id3lib/m4/lf_nm.m4 1.1:
-	* common/id3lib/m4/lf_texidoc.m4 1.1:
-	* common/id3lib/m4/lf_txtc.m4 1.1:
-	* common/id3lib/m4/lf_warnings.m4 1.1:
-	* common/id3lib/m4/lf_x11.m4 1.1:
-	* common/id3lib/missing 1.1:
-	* common/id3lib/mkinstalldirs 1.1:
-	* common/id3lib/reconf 1.1:
-	* common/id3lib/rename.pl 1.1:
-	* common/id3lib/src/.cvsignore 1.1:
-	* common/id3lib/src/Makefile.am 1.1:
-	* common/id3lib/src/Makefile.in 1.1:
-	* common/id3lib/src/c_wrapper.cpp 1.1:
-	* common/id3lib/src/error.cpp 1.1:
-	* common/id3lib/src/field.cpp 1.1:
-	* common/id3lib/src/field_binary.cpp 1.1:
-	* common/id3lib/src/field_integer.cpp 1.1:
-	* common/id3lib/src/field_string_ascii.cpp 1.1:
-	* common/id3lib/src/field_string_unicode.cpp 1.1:
-	* common/id3lib/src/frame.cpp 1.1:
-	* common/id3lib/src/frame_parse.cpp 1.1:
-	* common/id3lib/src/frame_render.cpp 1.1:
-	* common/id3lib/src/globals.cpp 1.1:
-	* common/id3lib/src/header.cpp 1.1:
-	* common/id3lib/src/header_frame.cpp 1.1:
-	* common/id3lib/src/header_tag.cpp 1.1:
-	* common/id3lib/src/int28.cpp 1.1:
-	* common/id3lib/src/misc_support.cpp 1.1:
-	* common/id3lib/src/spec.cpp 1.1:
-	* common/id3lib/src/tag.cpp 1.1:
-	* common/id3lib/src/tag_file.cpp 1.1:
-	* common/id3lib/src/tag_find.cpp 1.1:
-	* common/id3lib/src/tag_parse.cpp 1.1:
-	* common/id3lib/src/tag_parse_lyrics3.cpp 1.1:
-	* common/id3lib/src/tag_parse_v1.cpp 1.1:
-	* common/id3lib/src/tag_render.cpp 1.1:
-	* common/id3lib/src/tag_sync.cpp 1.1:
-	* common/id3lib/src/uint28.cpp 1.1:
-	* common/id3lib/src/utils.cpp 1.1:
-	* common/id3lib/stamp-h.in 1.1:
-	* common/id3lib/win32/config.h 1.1:
-	* common/id3lib/zlib/.cvsignore 1.1:
-	* common/id3lib/zlib/Makefile.am 1.1:
-	* common/id3lib/zlib/Makefile.in 1.1:
-	* common/id3lib/zlib/include/.cvsignore 1.1:
-	* common/id3lib/zlib/include/Makefile.am 1.1:
-	* common/id3lib/zlib/include/Makefile.in 1.1:
-	* common/id3lib/zlib/include/deflate.h 1.1:
-	* common/id3lib/zlib/include/infblock.h 1.1:
-	* common/id3lib/zlib/include/infcodes.h 1.1:
-	* common/id3lib/zlib/include/inffast.h 1.1:
-	* common/id3lib/zlib/include/inffixed.h 1.1:
-	* common/id3lib/zlib/include/inftrees.h 1.1:
-	* common/id3lib/zlib/include/infutil.h 1.1:
-	* common/id3lib/zlib/include/trees.h 1.1:
-	* common/id3lib/zlib/include/zconf.h 1.1:
-	* common/id3lib/zlib/include/zlib.h 1.1:
-	* common/id3lib/zlib/include/zutil.h 1.1:
-	* common/id3lib/zlib/lib/.cvsignore 1.1:
-	* common/id3lib/zlib/lib/Makefile.am 1.1:
-	* common/id3lib/zlib/lib/Makefile.in 1.1:
-	* common/id3lib/zlib/prj/.cvsignore 1.1:
-	* common/id3lib/zlib/prj/Makefile.am 1.1:
-	* common/id3lib/zlib/prj/Makefile.in 1.1:
-	* common/id3lib/zlib/prj/zlib.dsp 1.1:
-	* common/id3lib/zlib/prj/zlib.dsw 1.1:
-	* common/id3lib/zlib/prj/zlib.mak 1.1:
-	* common/id3lib/zlib/src/.cvsignore 1.1:
-	* common/id3lib/zlib/src/Makefile.am 1.1:
-	* common/id3lib/zlib/src/Makefile.in 1.1:
-	* common/id3lib/zlib/src/adler32.c 1.1:
-	* common/id3lib/zlib/src/compress.c 1.1:
-	* common/id3lib/zlib/src/crc32.c 1.1:
-	* common/id3lib/zlib/src/deflate.c 1.1:
-	* common/id3lib/zlib/src/gzio.c 1.1:
-	* common/id3lib/zlib/src/infblock.c 1.1:
-	* common/id3lib/zlib/src/infcodes.c 1.1:
-	* common/id3lib/zlib/src/inffast.c 1.1:
-	* common/id3lib/zlib/src/inflate.c 1.1:
-	* common/id3lib/zlib/src/inftrees.c 1.1:
-	* common/id3lib/zlib/src/infutil.c 1.1:
-	* common/id3lib/zlib/src/trees.c 1.1:
-	* common/id3lib/zlib/src/uncompr.c 1.1:
-	* common/id3lib/zlib/src/zutil.c 1.1:
-		Added id3v2 library
-
-	* common/faad/filestream.c 1.2:
-	* common/faad/filestream.h 1.2:
-	* common/faad/id3v2tag.c 1.2:
-	* common/faad/id3v2tag.h 1.2:
-		Forgot something :-)
-
-2002-01-20  menno
-	* plugins/winamp/in2.h 1.1:
-	* plugins/winamp/in_faad.c 1.1:
-	* plugins/winamp/in_faad.dsp 1.1:
-	* plugins/winamp/in_faad.dsw 1.1:
-	* plugins/winamp/out.h 1.1:
-	* plugins/winamp/plugin_dlg.rc 1.1:
-	* plugins/winamp/resource.h 1.1:
-		Winamp2 AAC plugin
-		basically the same as old one, but with new library, and:
-		- new way of saving configuration (no more faad.dat)
-		- better multichannel handling
-
-	* plugins/in_mp4/in2.h 1.1:
-	* plugins/in_mp4/in_mp4.c 1.1:
-	* plugins/in_mp4/in_mp4.dsp 1.1:
-	* plugins/in_mp4/in_mp4.dsw 1.1:
-	* plugins/in_mp4/in_mp4.rc 1.1:
-	* plugins/in_mp4/out.h 1.1:
-	* plugins/in_mp4/resource.h 1.1:
-		MPEG-4 AAC Winamp input plugin!!
-
-	* include/faad.h 1.3:
-	* libfaad/decoder.c 1.6:
-	* libfaad/libfaad.dsp 1.3:
-	* libfaad/mp4.c 1.1:
-	* libfaad/mp4.h 1.1:
-	* libfaad/syntax.c 1.4:
-	* libfaad/syntax.h 1.3:
-		Changes for easier MP4 file playing
-
-2002-01-19  menno
-	* frontend/main.c 1.8:
-	* include/faad.h 1.2:
-	* libfaad/bits.c 1.2:
-	* libfaad/bits.h 1.2:
-	* libfaad/debug.h 1.1:
-	* libfaad/decoder.c 1.3:
-	* libfaad/decoder.h 1.2:
-	* libfaad/huffman.c 1.2:
-	* libfaad/huffman.h 1.2:
-	* libfaad/is.h 1.2:
-	* libfaad/libfaad.dsp 1.2:
-	* libfaad/pns.h 1.2:
-	* libfaad/syntax.c 1.2:
-	* libfaad/syntax.h 1.2:
-		- decodes mp4 files correctly
-		- bug fix in tns_data()
-		- added bitstream analysis
-
-	* libfaad/bits.c 1.3:
-	* libfaad/decoder.c 1.5:
-	* libfaad/huffman.h 1.3:
-	* libfaad/syntax.c 1.3:
-		Improved bitstream analysis
-
-	* libfaad/decoder.c 1.4:
-		improved error handling
-
-2002-01-16  menno
-	* libfaad/predict.c 1.2:
-		Removed double file
-
-	* frontend/main.c 1.7:
-		Buffer deallocation
-
-2002-01-15  menno
-	* common/mp4v2/COPYING 1.1:
-	* common/mp4v2/INTERNALS 1.1:
-	* common/mp4v2/Makefile.am 1.1:
-	* common/mp4v2/TODO 1.1:
-	* common/mp4v2/atom_co64.cpp 1.1:
-	* common/mp4v2/atom_cprt.cpp 1.1:
-	* common/mp4v2/atom_ctts.cpp 1.1:
-	* common/mp4v2/atom_dimm.cpp 1.1:
-	* common/mp4v2/atom_dinf.cpp 1.1:
-	* common/mp4v2/atom_dmax.cpp 1.1:
-	* common/mp4v2/atom_dmed.cpp 1.1:
-	* common/mp4v2/atom_dref.cpp 1.1:
-	* common/mp4v2/atom_drep.cpp 1.1:
-	* common/mp4v2/atom_edts.cpp 1.1:
-	* common/mp4v2/atom_elst.cpp 1.1:
-	* common/mp4v2/atom_esds.cpp 1.1:
-	* common/mp4v2/atom_free.cpp 1.1:
-	* common/mp4v2/atom_ftyp.cpp 1.1:
-	* common/mp4v2/atom_hdlr.cpp 1.1:
-	* common/mp4v2/atom_hinf.cpp 1.1:
-	* common/mp4v2/atom_hmhd.cpp 1.1:
-	* common/mp4v2/atom_hnti.cpp 1.1:
-	* common/mp4v2/atom_iods.cpp 1.1:
-	* common/mp4v2/atom_maxr.cpp 1.1:
-	* common/mp4v2/atom_mdat.cpp 1.1:
-	* common/mp4v2/atom_mdhd.cpp 1.1:
-	* common/mp4v2/atom_mdia.cpp 1.1:
-	* common/mp4v2/atom_mfhd.cpp 1.1:
-	* common/mp4v2/atom_minf.cpp 1.1:
-	* common/mp4v2/atom_moof.cpp 1.1:
-	* common/mp4v2/atom_moov.cpp 1.1:
-	* common/mp4v2/atom_mp4a.cpp 1.1:
-	* common/mp4v2/atom_mp4s.cpp 1.1:
-	* common/mp4v2/atom_mp4v.cpp 1.1:
-	* common/mp4v2/atom_mvex.cpp 1.1:
-	* common/mp4v2/atom_mvhd.cpp 1.1:
-	* common/mp4v2/atom_nmhd.cpp 1.1:
-	* common/mp4v2/atom_nump.cpp 1.1:
-	* common/mp4v2/atom_payt.cpp 1.1:
-	* common/mp4v2/atom_pmax.cpp 1.1:
-	* common/mp4v2/atom_root.cpp 1.1:
-	* common/mp4v2/atom_rtp.cpp 1.1:
-	* common/mp4v2/atom_sdp.cpp 1.1:
-	* common/mp4v2/atom_smhd.cpp 1.1:
-	* common/mp4v2/atom_snro.cpp 1.1:
-	* common/mp4v2/atom_stbl.cpp 1.1:
-	* common/mp4v2/atom_stco.cpp 1.1:
-	* common/mp4v2/atom_stdp.cpp 1.1:
-	* common/mp4v2/atom_stsc.cpp 1.1:
-	* common/mp4v2/atom_stsd.cpp 1.1:
-	* common/mp4v2/atom_stsh.cpp 1.1:
-	* common/mp4v2/atom_stss.cpp 1.1:
-	* common/mp4v2/atom_stsz.cpp 1.1:
-	* common/mp4v2/atom_stts.cpp 1.1:
-	* common/mp4v2/atom_tfhd.cpp 1.1:
-	* common/mp4v2/atom_tims.cpp 1.1:
-	* common/mp4v2/atom_tkhd.cpp 1.1:
-	* common/mp4v2/atom_tmax.cpp 1.1:
-	* common/mp4v2/atom_tmin.cpp 1.1:
-	* common/mp4v2/atom_tpyl.cpp 1.1:
-	* common/mp4v2/atom_traf.cpp 1.1:
-	* common/mp4v2/atom_trak.cpp 1.1:
-	* common/mp4v2/atom_tref.cpp 1.1:
-	* common/mp4v2/atom_treftype.cpp 1.1:
-	* common/mp4v2/atom_trex.cpp 1.1:
-	* common/mp4v2/atom_trpy.cpp 1.1:
-	* common/mp4v2/atom_trun.cpp 1.1:
-	* common/mp4v2/atom_tsro.cpp 1.1:
-	* common/mp4v2/atom_udta.cpp 1.1:
-	* common/mp4v2/atom_url.cpp 1.1:
-	* common/mp4v2/atom_urn.cpp 1.1:
-	* common/mp4v2/atom_vmhd.cpp 1.1:
-	* common/mp4v2/atoms.h 1.1:
-	* common/mp4v2/descriptors.cpp 1.1:
-	* common/mp4v2/descriptors.h 1.1:
-	* common/mp4v2/isma.cpp 1.1:
-	* common/mp4v2/libmp4v2.dsp 1.1:
-	* common/mp4v2/libmp4v260.dsp 1.1:
-	* common/mp4v2/libmp4v2_st.dsp 1.1:
-	* common/mp4v2/libmp4v2_st60.dsp 1.1:
-	* common/mp4v2/mp4.cpp 1.1:
-	* common/mp4v2/mp4.h 1.1:
-	* common/mp4v2/mp4array.h 1.1:
-	* common/mp4v2/mp4atom.cpp 1.1:
-	* common/mp4v2/mp4atom.h 1.1:
-	* common/mp4v2/mp4common.h 1.1:
-	* common/mp4v2/mp4container.cpp 1.1:
-	* common/mp4v2/mp4container.h 1.1:
-	* common/mp4v2/mp4descriptor.cpp 1.1:
-	* common/mp4v2/mp4descriptor.h 1.1:
-	* common/mp4v2/mp4file.cpp 1.1:
-	* common/mp4v2/mp4file.h 1.1:
-	* common/mp4v2/mp4file_io.cpp 1.1:
-	* common/mp4v2/mp4property.cpp 1.1:
-	* common/mp4v2/mp4property.h 1.1:
-	* common/mp4v2/mp4track.cpp 1.1:
-	* common/mp4v2/mp4track.h 1.1:
-	* common/mp4v2/mp4util.cpp 1.1:
-	* common/mp4v2/mp4util.h 1.1:
-	* common/mp4v2/mpeg4ip.h 1.1:
-	* common/mp4v2/need_for_win32.c 1.1:
-	* common/mp4v2/ocidescriptors.cpp 1.1:
-	* common/mp4v2/ocidescriptors.h 1.1:
-	* common/mp4v2/odcommands.cpp 1.1:
-	* common/mp4v2/odcommands.h 1.1:
-	* common/mp4v2/qosqualifiers.cpp 1.1:
-	* common/mp4v2/qosqualifiers.h 1.1:
-	* common/mp4v2/rtphint.cpp 1.1:
-	* common/mp4v2/rtphint.h 1.1:
-	* common/mp4v2/systems.h 1.1:
-	* common/mp4v2/win32_ver.h 1.1:
-	* frontend/audio.c 1.1:
-	* frontend/audio.h 1.1:
-	* frontend/faad.dsp 1.2:
-	* frontend/faad.dsw 1.2:
-	* frontend/main.c 1.2:
-	* libfaad/decoder.c 1.2:
-		Added MP4 file support
-
-	* frontend/main.c 1.3:
-		Oops, forgot to check for errors in MP4 file decoding
-
-	* frontend/main.c 1.4:
-		Bugfix for MP4 files
-
-	* frontend/main.c 1.6:
-		Fix for strange sample rate from MP4 files (sometimes it's an
-		index and sometimes it's the actual value)
-
-	* frontend/main.c 1.5:
-		Ouch, I need some rest :-)
-
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
 
+6 February 2004
+ - FAAD2 version 2.0 released
+
 25 July 2003
- - Release version with SBR decoding
\ No newline at end of file
+ - Release version with SBR decoding
--- a/README
+++ b/README
@@ -87,10 +87,12 @@
       faad - general common functions like filereading and streaming
              as well as getting info from aac files.
 
-      id3lib - id3 tag editor library.
-
       mp4v2 - MPEG-4 file reading library.
       
+      mp4av - MPEG-4 file general function library.
+      
+      mp4ff - Small MP4 file format library (includes tagging abilities).
+      
    CoreAAC - AAC DirectShow filter.
 
    frontend - command line frontend to the FAAD2 library, also supports
@@ -104,8 +106,6 @@
 
    plugins - plugins for all kinds of pograms.
    
-      foo_mp4 - mp4/aac plugin for foobar2000.
-
       in_mp4 - winamp MPEG-4 AAC file input plugin.
       
       QCD - Quintessential player AAC plugin.
@@ -117,4 +117,6 @@
       winamp3 - winamp3 AAC input plugin.
       
       xmms - xmms AAC plugin
+
+      mpeg4ip - plugin for the mpeg4ip player
 
--- a/TODO
+++ b/TODO
@@ -1,9 +1,2 @@
 
-- Small fixes to PNS (see pns.c)
-- Channel coupling (skipping works)
-- SSR (???)
-
-- Reintroduce:
- - Sonique plugin
- - CoolEdit plugin
-
+- Not much...
--- a/aacDECdrop/aacDECdrop/aacDECdrop.dsp
+++ b/aacDECdrop/aacDECdrop/aacDECdrop.dsp
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
@@ -51,14 +51,9 @@
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib svml_disp.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"LIBCMT.lib"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Compressing using UPX...
-PostBuild_Cmds=upx --best .\release\aacDECdrop.exe
-# End Special Build Tool
+# ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"LIBCMT.lib"
 
 !ELSEIF  "$(CFG)" == "aacDECdrop - Win32 Debug"
 
@@ -82,7 +77,7 @@
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 ws2_32.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 
--- a/aacDECdrop/audio.c
+++ b/aacDECdrop/audio.c
@@ -1,25 +1,28 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker (mbakker(at)nero.com), Ahead Software AG
-**  
+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
+**
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
+** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** Commercial non-GPL licensing of this software is also possible.
+** Any non-GPL usage of this software or parts of this software is strictly
+** forbidden.
+**
+** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: audio.c,v 1.10 2003/07/29 08:20:11 menno Exp $
+** $Id: audio.c,v 1.11 2004/02/06 10:23:27 menno Exp $
 **/
 
 #ifdef _WIN32
@@ -34,7 +37,7 @@
 
 
 audio_file *open_audio_file(char *infile, int samplerate, int channels,
-                            int outputFormat, int fileType)
+                            int outputFormat, int fileType, long channelMask)
 {
     audio_file *aufile = malloc(sizeof(audio_file));
 
@@ -44,14 +47,11 @@
     aufile->channels = channels;
     aufile->total_samples = 0;
     aufile->fileType = fileType;
+    aufile->channelMask = channelMask;
 
     switch (outputFormat)
     {
     case FAAD_FMT_16BIT:
-    case FAAD_FMT_16BIT_DITHER:
-    case FAAD_FMT_16BIT_L_SHAPE:
-    case FAAD_FMT_16BIT_M_SHAPE:
-    case FAAD_FMT_16BIT_H_SHAPE:
         aufile->bits_per_sample = 16;
         break;
     case FAAD_FMT_24BIT:
@@ -66,13 +66,15 @@
         return NULL;
     }
 
-#ifdef _WIN32
     if(infile[0] == '-')
     {
+#ifdef _WIN32
         setmode(fileno(stdout), O_BINARY);
-    }
 #endif
-    aufile->sndfile = fopen(infile, "wb");
+        aufile->sndfile = stdout;
+    } else {
+        aufile->sndfile = fopen(infile, "wb");
+    }
 
     if (aufile->sndfile == NULL)
     {
@@ -82,28 +84,28 @@
 
     if (aufile->fileType == OUTPUT_WAV)
     {
-        write_wav_header(aufile);
+        if (aufile->channelMask)
+            write_wav_extensible_header(aufile, aufile->channelMask);
+        else
+            write_wav_header(aufile);
     }
 
     return aufile;
 }
 
-int write_audio_file(audio_file *aufile, void *sample_buffer, int samples)
+int write_audio_file(audio_file *aufile, void *sample_buffer, int samples, int offset)
 {
+    char *buf = (char *)sample_buffer;
     switch (aufile->outputFormat)
     {
     case FAAD_FMT_16BIT:
-    case FAAD_FMT_16BIT_DITHER:
-    case FAAD_FMT_16BIT_L_SHAPE:
-    case FAAD_FMT_16BIT_M_SHAPE:
-    case FAAD_FMT_16BIT_H_SHAPE:
-        return write_audio_16bit(aufile, sample_buffer, samples);
+        return write_audio_16bit(aufile, buf + offset*2, samples);
     case FAAD_FMT_24BIT:
-        return write_audio_24bit(aufile, sample_buffer, samples);
+        return write_audio_24bit(aufile, buf + offset*4, samples);
     case FAAD_FMT_32BIT:
-        return write_audio_32bit(aufile, sample_buffer, samples);
+        return write_audio_32bit(aufile, buf + offset*4, samples);
     case FAAD_FMT_FLOAT:
-        return write_audio_float(aufile, sample_buffer, samples);
+        return write_audio_float(aufile, buf + offset*4, samples);
     default:
         return 0;
     }
@@ -117,7 +119,10 @@
     {
         fseek(aufile->sndfile, 0, SEEK_SET);
 
-        write_wav_header(aufile);
+        if (aufile->channelMask)
+            write_wav_extensible_header(aufile, aufile->channelMask);
+        else
+            write_wav_header(aufile);
     }
 
     fclose(aufile->sndfile);
@@ -189,6 +194,105 @@
     return fwrite(header, sizeof(header), 1, aufile->sndfile);
 }
 
+static int write_wav_extensible_header(audio_file *aufile, long channelMask)
+{
+    unsigned char header[68];
+    unsigned char* p = header;
+    unsigned int bytes = (aufile->bits_per_sample + 7) / 8;
+    float data_size = (float)bytes * aufile->total_samples;
+    unsigned long word32;
+
+    *p++ = 'R'; *p++ = 'I'; *p++ = 'F'; *p++ = 'F';
+
+    word32 = (data_size + (68 - 8) < (float)MAXWAVESIZE) ?
+        (unsigned long)data_size + (68 - 8)  :  (unsigned long)MAXWAVESIZE;
+    *p++ = (unsigned char)(word32 >>  0);
+    *p++ = (unsigned char)(word32 >>  8);
+    *p++ = (unsigned char)(word32 >> 16);
+    *p++ = (unsigned char)(word32 >> 24);
+
+    *p++ = 'W'; *p++ = 'A'; *p++ = 'V'; *p++ = 'E';
+
+    *p++ = 'f'; *p++ = 'm'; *p++ = 't'; *p++ = ' ';
+
+    *p++ = /*0x10*/0x28; *p++ = 0x00; *p++ = 0x00; *p++ = 0x00;
+
+    /* WAVE_FORMAT_EXTENSIBLE */
+    *p++ = 0xFE; *p++ = 0xFF;
+
+    *p++ = (unsigned char)(aufile->channels >> 0);
+    *p++ = (unsigned char)(aufile->channels >> 8);
+
+    word32 = (unsigned long)(aufile->samplerate + 0.5);
+    *p++ = (unsigned char)(word32 >>  0);
+    *p++ = (unsigned char)(word32 >>  8);
+    *p++ = (unsigned char)(word32 >> 16);
+    *p++ = (unsigned char)(word32 >> 24);
+
+    word32 = aufile->samplerate * bytes * aufile->channels;
+    *p++ = (unsigned char)(word32 >>  0);
+    *p++ = (unsigned char)(word32 >>  8);
+    *p++ = (unsigned char)(word32 >> 16);
+    *p++ = (unsigned char)(word32 >> 24);
+
+    word32 = bytes * aufile->channels;
+    *p++ = (unsigned char)(word32 >>  0);
+    *p++ = (unsigned char)(word32 >>  8);
+
+    *p++ = (unsigned char)(aufile->bits_per_sample >> 0);
+    *p++ = (unsigned char)(aufile->bits_per_sample >> 8);
+
+    /* cbSize */
+    *p++ = (unsigned char)(22);
+    *p++ = (unsigned char)(0);
+
+    /* WAVEFORMATEXTENSIBLE */
+
+    /* wValidBitsPerSample */
+    *p++ = (unsigned char)(aufile->bits_per_sample >> 0);
+    *p++ = (unsigned char)(aufile->bits_per_sample >> 8);
+
+    /* dwChannelMask */
+    word32 = channelMask;
+    *p++ = (unsigned char)(word32 >>  0);
+    *p++ = (unsigned char)(word32 >>  8);
+    *p++ = (unsigned char)(word32 >> 16);
+    *p++ = (unsigned char)(word32 >> 24);
+
+    /* SubFormat */
+    if (aufile->outputFormat == FAAD_FMT_FLOAT)
+    {
+        /* KSDATAFORMAT_SUBTYPE_IEEE_FLOAT: 00000003-0000-0010-8000-00aa00389b71 */
+        *p++ = 0x03;
+        *p++ = 0x00;
+        *p++ = 0x00;
+        *p++ = 0x00;
+        *p++ = 0x00; *p++ = 0x00; *p++ = 0x10; *p++ = 0x00; *p++ = 0x80; *p++ = 0x00;
+        *p++ = 0x00; *p++ = 0xaa; *p++ = 0x00; *p++ = 0x38; *p++ = 0x9b; *p++ = 0x71;
+    } else {
+        /* KSDATAFORMAT_SUBTYPE_PCM: 00000001-0000-0010-8000-00aa00389b71 */
+        *p++ = 0x01;
+        *p++ = 0x00;
+        *p++ = 0x00;
+        *p++ = 0x00;
+        *p++ = 0x00; *p++ = 0x00; *p++ = 0x10; *p++ = 0x00; *p++ = 0x80; *p++ = 0x00;
+        *p++ = 0x00; *p++ = 0xaa; *p++ = 0x00; *p++ = 0x38; *p++ = 0x9b; *p++ = 0x71;
+    }
+
+    /* end WAVEFORMATEXTENSIBLE */
+
+    *p++ = 'd'; *p++ = 'a'; *p++ = 't'; *p++ = 'a';
+
+    word32 = data_size < MAXWAVESIZE ?
+        (unsigned long)data_size : (unsigned long)MAXWAVESIZE;
+    *p++ = (unsigned char)(word32 >>  0);
+    *p++ = (unsigned char)(word32 >>  8);
+    *p++ = (unsigned char)(word32 >> 16);
+    *p++ = (unsigned char)(word32 >> 24);
+
+    return fwrite(header, sizeof(header), 1, aufile->sndfile);
+}
+
 static int write_audio_16bit(audio_file *aufile, void *sample_buffer,
                              unsigned int samples)
 {
@@ -199,6 +303,26 @@
 
     aufile->total_samples += samples;
 
+    if (aufile->channels == 6 && aufile->channelMask)
+    {
+        for (i = 0; i < samples; i += aufile->channels)
+        {
+            short r1, r2, r3, r4, r5, r6;
+            r1 = sample_buffer16[i];
+            r2 = sample_buffer16[i+1];
+            r3 = sample_buffer16[i+2];
+            r4 = sample_buffer16[i+3];
+            r5 = sample_buffer16[i+4];
+            r6 = sample_buffer16[i+5];
+            sample_buffer16[i] = r2;
+            sample_buffer16[i+1] = r3;
+            sample_buffer16[i+2] = r1;
+            sample_buffer16[i+3] = r6;
+            sample_buffer16[i+4] = r4;
+            sample_buffer16[i+5] = r5;
+        }
+    }
+
     for (i = 0; i < samples; i++)
     {
         data[i*2] = (char)(sample_buffer16[i] & 0xFF);
@@ -222,6 +346,26 @@
 
     aufile->total_samples += samples;
 
+    if (aufile->channels == 6 && aufile->channelMask)
+    {
+        for (i = 0; i < samples; i += aufile->channels)
+        {
+            long r1, r2, r3, r4, r5, r6;
+            r1 = sample_buffer24[i];
+            r2 = sample_buffer24[i+1];
+            r3 = sample_buffer24[i+2];
+            r4 = sample_buffer24[i+3];
+            r5 = sample_buffer24[i+4];
+            r6 = sample_buffer24[i+5];
+            sample_buffer24[i] = r2;
+            sample_buffer24[i+1] = r3;
+            sample_buffer24[i+2] = r1;
+            sample_buffer24[i+3] = r6;
+            sample_buffer24[i+4] = r4;
+            sample_buffer24[i+5] = r5;
+        }
+    }
+
     for (i = 0; i < samples; i++)
     {
         data[i*3] = (char)(sample_buffer24[i] & 0xFF);
@@ -246,6 +390,26 @@
 
     aufile->total_samples += samples;
 
+    if (aufile->channels == 6 && aufile->channelMask)
+    {
+        for (i = 0; i < samples; i += aufile->channels)
+        {
+            long r1, r2, r3, r4, r5, r6;
+            r1 = sample_buffer32[i];
+            r2 = sample_buffer32[i+1];
+            r3 = sample_buffer32[i+2];
+            r4 = sample_buffer32[i+3];
+            r5 = sample_buffer32[i+4];
+            r6 = sample_buffer32[i+5];
+            sample_buffer32[i] = r2;
+            sample_buffer32[i+1] = r3;
+            sample_buffer32[i+2] = r1;
+            sample_buffer32[i+3] = r6;
+            sample_buffer32[i+4] = r4;
+            sample_buffer32[i+5] = r5;
+        }
+    }
+
     for (i = 0; i < samples; i++)
     {
         data[i*4] = (char)(sample_buffer32[i] & 0xFF);
@@ -270,6 +434,26 @@
     unsigned char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8);
 
     aufile->total_samples += samples;
+
+    if (aufile->channels == 6 && aufile->channelMask)
+    {
+        for (i = 0; i < samples; i += aufile->channels)
+        {
+            float r1, r2, r3, r4, r5, r6;
+            r1 = sample_buffer_f[i];
+            r2 = sample_buffer_f[i+1];
+            r3 = sample_buffer_f[i+2];
+            r4 = sample_buffer_f[i+3];
+            r5 = sample_buffer_f[i+4];
+            r6 = sample_buffer_f[i+5];
+            sample_buffer_f[i] = r2;
+            sample_buffer_f[i+1] = r3;
+            sample_buffer_f[i+2] = r1;
+            sample_buffer_f[i+3] = r6;
+            sample_buffer_f[i+4] = r4;
+            sample_buffer_f[i+5] = r5;
+        }
+    }
 
     for (i = 0; i < samples; i++)
     {
--- a/aacDECdrop/audio.h
+++ b/aacDECdrop/audio.h
@@ -1,6 +1,6 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker (mbakker(at)nero.com), Ahead Software AG
+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
 **  
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -16,10 +16,13 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** Commercial non-GPL licensing of this software is also possible.
+** Any non-GPL usage of this software or parts of this software is strictly
+** forbidden.
+**
+** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: audio.h,v 1.8 2003/07/29 08:20:11 menno Exp $
+** $Id: audio.h,v 1.9 2004/02/06 10:23:27 menno Exp $
 **/
 
 #ifndef AUDIO_H_INCLUDED
@@ -43,13 +46,15 @@
     unsigned int bits_per_sample;
     unsigned int channels;
     unsigned long total_samples;
+    long channelMask;
 } audio_file;
 
 audio_file *open_audio_file(char *infile, int samplerate, int channels,
-                            int outputFormat, int fileType);
-int write_audio_file(audio_file *aufile, void *sample_buffer, int samples);
+                            int outputFormat, int fileType, long channelMask);
+int write_audio_file(audio_file *aufile, void *sample_buffer, int samples, int offset);
 void close_audio_file(audio_file *aufile);
 static int write_wav_header(audio_file *aufile);
+static int write_wav_extensible_header(audio_file *aufile, long channelMask);
 static int write_audio_16bit(audio_file *aufile, void *sample_buffer,
                              unsigned int samples);
 static int write_audio_24bit(audio_file *aufile, void *sample_buffer,
--- a/aacDECdrop/decode.c
+++ b/aacDECdrop/decode.c
@@ -16,8 +16,8 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: decode.c,v 1.14 2003/07/07 21:11:17 menno Exp $
-** $Id: decode.c,v 1.14 2003/07/07 21:11:17 menno Exp $
+** $Id: decode.c,v 1.15 2004/02/06 10:23:27 menno Exp $
+** $Id: decode.c,v 1.15 2004/02/06 10:23:27 menno Exp $
 **/
 
 #ifdef _WIN32
@@ -123,6 +123,39 @@
     NULL
 };
 
+/* MicroSoft channel definitions */
+#define SPEAKER_FRONT_LEFT             0x1
+#define SPEAKER_FRONT_RIGHT            0x2
+#define SPEAKER_FRONT_CENTER           0x4
+#define SPEAKER_LOW_FREQUENCY          0x8
+#define SPEAKER_BACK_LEFT              0x10
+#define SPEAKER_BACK_RIGHT             0x20
+#define SPEAKER_FRONT_LEFT_OF_CENTER   0x40
+#define SPEAKER_FRONT_RIGHT_OF_CENTER  0x80
+#define SPEAKER_BACK_CENTER            0x100
+#define SPEAKER_SIDE_LEFT              0x200
+#define SPEAKER_SIDE_RIGHT             0x400
+#define SPEAKER_TOP_CENTER             0x800
+#define SPEAKER_TOP_FRONT_LEFT         0x1000
+#define SPEAKER_TOP_FRONT_CENTER       0x2000
+#define SPEAKER_TOP_FRONT_RIGHT        0x4000
+#define SPEAKER_TOP_BACK_LEFT          0x8000
+#define SPEAKER_TOP_BACK_CENTER        0x10000
+#define SPEAKER_TOP_BACK_RIGHT         0x20000
+#define SPEAKER_RESERVED               0x80000000
+
+long aacChannelConfig2wavexChannelMask(faacDecFrameInfo *hInfo)
+{
+    if (hInfo->channels == 6 && hInfo->num_lfe_channels)
+    {
+        return SPEAKER_FRONT_LEFT + SPEAKER_FRONT_RIGHT +
+            SPEAKER_FRONT_CENTER + SPEAKER_LOW_FREQUENCY +
+            SPEAKER_BACK_LEFT + SPEAKER_BACK_RIGHT;
+    } else {
+        return 0;
+    }
+}
+
 int decodeAACfile(char *sndfile, int def_srate, aac_dec_opt *opt)
 {
     int tagsize;
@@ -219,7 +252,7 @@
             else
             {
                 aufile = open_audio_file(sndfile, samplerate, frameInfo.channels,
-                    opt->output_format, opt->file_type);
+                    opt->output_format, opt->file_type, aacChannelConfig2wavexChannelMask(&frameInfo));
 
                 if (aufile == NULL)
                 {
@@ -237,7 +270,7 @@
             if(opt->decode_mode == 0)
                 WIN_Play_Samples((short*)sample_buffer, frameInfo.channels*frameInfo.samples);
             else
-                write_audio_file(aufile, sample_buffer, frameInfo.samples);
+                write_audio_file(aufile, sample_buffer, frameInfo.samples, 0);
         }
 
         if (buffer_index >= fileread)
@@ -401,7 +434,7 @@
             else
             {
                 aufile = open_audio_file(sndfile, samplerate, frameInfo.channels,
-                     opt->output_format, opt->file_type);
+                     opt->output_format, opt->file_type, aacChannelConfig2wavexChannelMask(&frameInfo));
 
                 if (aufile == NULL)
                 {
@@ -418,7 +451,7 @@
             if(opt->decode_mode == 0)
                 WIN_Play_Samples((short*)sample_buffer, frameInfo.channels*frameInfo.samples);
             else
-                write_audio_file(aufile, sample_buffer, frameInfo.samples);
+                write_audio_file(aufile, sample_buffer, frameInfo.samples, 0);
         }
 
         if (frameInfo.error > 0)
--- a/common/mp4ff/mp4ff.vcproj
+++ b/common/mp4ff/mp4ff.vcproj
@@ -1,116 +1,116 @@
 <?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject 
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="mp4ff"
-	ProjectGUID="{F470BB4A-7675-4D6A-B310-41F33AC6F987}"
-	SccProjectName=""
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="mp4ff"
+	ProjectGUID="{F470BB4A-7675-4D6A-B310-41F33AC6F987}"
+	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
-		<Platform 
+		<Platform
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
-		<Configuration 
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			UseOfMFC="0"
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool 
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="USE_TAGGING"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/mp4ff.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions=""
+				Optimization="1"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="USE_TAGGING"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/mp4ff.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"/>
-			<Tool 
+			<Tool
 				Name="VCCustomBuildTool"/>
-			<Tool 
-				Name="VCLibrarianTool"
-				AdditionalOptions=""
-				OutputFile=".\Release\mp4ff.lib"
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions=""
+				OutputFile=".\Release\mp4ff.lib"
 				SuppressStartupBanner="TRUE"/>
-			<Tool 
+			<Tool
 				Name="VCMIDLTool"/>
-			<Tool 
+			<Tool
 				Name="VCPostBuildEventTool"/>
-			<Tool 
+			<Tool
 				Name="VCPreBuildEventTool"/>
-			<Tool 
+			<Tool
 				Name="VCPreLinkEventTool"/>
-			<Tool 
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1043"/>
-			<Tool 
+			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
+			<Tool
 				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
+			<Tool
 				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool 
+			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
-		<Configuration 
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool 
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="0"
-				PreprocessorDefinitions="USE_TAGGING"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/mp4ff.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions=""
+				Optimization="0"
+				PreprocessorDefinitions="USE_TAGGING"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/mp4ff.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"/>
-			<Tool 
+			<Tool
 				Name="VCCustomBuildTool"/>
-			<Tool 
-				Name="VCLibrarianTool"
-				AdditionalOptions=""
-				OutputFile=".\Debug\mp4ff.lib"
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions=""
+				OutputFile=".\Debug\mp4ff.lib"
 				SuppressStartupBanner="TRUE"/>
-			<Tool 
+			<Tool
 				Name="VCMIDLTool"/>
-			<Tool 
+			<Tool
 				Name="VCPostBuildEventTool"/>
-			<Tool 
+			<Tool
 				Name="VCPreBuildEventTool"/>
-			<Tool 
+			<Tool
 				Name="VCPreLinkEventTool"/>
-			<Tool 
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1043"/>
-			<Tool 
+			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool 
+			<Tool
 				Name="VCXMLDataGeneratorTool"/>
-			<Tool 
+			<Tool
 				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool 
+			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
@@ -117,117 +117,132 @@
 	<References>
 	</References>
 	<Files>
-		<Filter 
-			Name="Source Files"
+		<Filter
+			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File 
+			<File
+				RelativePath=".\drms.c">
+			</File>
+			<File
 				RelativePath="mp4atom.c">
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Release|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="1"
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="1"
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Debug|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="0"
-						PreprocessorDefinitions=""
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="0"
+						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
-			<File 
+			<File
 				RelativePath="mp4ff.c">
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Release|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="1"
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="1"
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Debug|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="0"
-						PreprocessorDefinitions=""
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="0"
+						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
-			<File 
+			<File
 				RelativePath="mp4meta.c">
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Release|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="1"
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="1"
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Debug|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="0"
-						PreprocessorDefinitions=""
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="0"
+						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
-			<File 
+			<File
 				RelativePath="mp4sample.c">
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Release|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="1"
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="1"
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Debug|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="0"
-						PreprocessorDefinitions=""
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="0"
+						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
-			<File 
+			<File
 				RelativePath=".\mp4tagupdate.c">
 			</File>
-			<File 
+			<File
 				RelativePath="mp4util.c">
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Release|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="1"
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="1"
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
-				<FileConfiguration 
+				<FileConfiguration
 					Name="Debug|Win32">
-					<Tool 
-						Name="VCCLCompilerTool"
-						AdditionalOptions=""
-						Optimization="0"
-						PreprocessorDefinitions=""
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions=""
+						Optimization="0"
+						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
-		<Filter 
-			Name="Header Files"
+		<Filter
+			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
-			<File 
+			<File
+				RelativePath=".\drms.h">
+			</File>
+			<File
+				RelativePath=".\drmstables.h">
+			</File>
+			<File
+				RelativePath=".\mp4ff.h">
+			</File>
+			<File
+				RelativePath=".\mp4ff_int_types.h">
+			</File>
+			<File
 				RelativePath="mp4ffint.h">
 			</File>
 		</Filter>
--- a/common/mp4v2/Makefile.am
+++ b/common/mp4v2/Makefile.am
@@ -4,7 +4,7 @@
 
 lib_LTLIBRARIES = libmp4v2.la
 
-include_HEADERS = mp4.h mpeg4ip.h
+include_HEADERS = mp4.h mpeg4ip.h systems.h
 
 libmp4v2_la_SOURCES = \
     atom_co64.cpp \
--- a/frontend/faad.vcproj
+++ b/frontend/faad.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -20,11 +20,12 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="0"
 				AdditionalIncludeDirectories="../include,../common/mp4ff,../common/faad"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug/faad.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -33,14 +34,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
-				CompileAs="0">
-				<IntelOptions
-					Optimization="0"
-					MinimalRebuild="1"
-					BasicRuntimeChecks="3"
-					RuntimeLibrary="1"
-					AllOptions="/c  /I &quot;../include&quot; /I &quot;../common/mp4ff&quot; /I &quot;../common/faad&quot; /ZI /nologo /W3 /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_CONSOLE&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/faad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd"/>
-			</Tool>
+				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -52,10 +46,7 @@
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/faad.pdb"
-				SubSystem="1">
-				<IntelOptions
-					AllOptions="/NOLOGO /OUT:&quot;.\Debug/faad.exe&quot; /INCREMENTAL ws2_32.lib odbc32.lib odbccp32.lib /DEBUG /PDB:&quot;.\Debug/faad.pdb&quot; /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 &quot;e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib&quot; &quot;e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib&quot; &quot;e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib&quot; &quot;e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib&quot; &quot;e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib&quot; &quot;e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib&quot; kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
-			</Tool>
+				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Debug/faad.tlb"/>
@@ -79,8 +70,6 @@
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-			<IntelOptions
-				CompilerName="1"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -92,6 +81,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="1"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
@@ -110,21 +100,7 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				CompileAs="0">
-				<IntelOptions
-					Optimization="1"
-					GlobalOptimizations="1"
-					InlineFunctionExpansion="1"
-					EnableIntrinsicFunctions="1"
-					FavorSizeOrSpeed="1"
-					OmitFramePointers="1"
-					OptimizeForProcessor="0"
-					StringPooling="1"
-					RuntimeLibrary="2"
-					BufferSecurityCheck="1"
-					EnableFunctionLevelLinking="1"
-					AllOptions="/c  /I &quot;../include&quot; /I &quot;../common/mp4ff&quot; /I &quot;../common/faad&quot; /nologo /W3 /O1 /Og /Ob1 /Oi /Ot /Oy /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_CONSOLE&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/faad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd"/>
-			</Tool>
+				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -134,10 +110,7 @@
 				OutputFile=".\Release/faad.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				SubSystem="1">
-				<IntelOptions
-					AllOptions="/NOLOGO /OUT:&quot;.\Release/faad.exe&quot; /INCREMENTAL:NO ws2_32.lib /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 &quot;..\libfaad\Release\libfaad.lib&quot; &quot;..\common\mp4v2\ST_Release\libmp4v2_st60.lib&quot; &quot;e:\cvs\audiocoding\faad2\libfaad\Release\libfaad.lib&quot; &quot;e:\cvs\audiocoding\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib&quot; kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
-			</Tool>
+				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Release/faad.tlb"/>
@@ -161,40 +134,50 @@
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-			<IntelOptions
-				CompilerName="1"/>
 		</Configuration>
 	</Configurations>
-	<References/>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath=".\audio.c"/>
+				RelativePath=".\audio.c">
+			</File>
 			<File
-				RelativePath="..\common\faad\getopt.c"/>
+				RelativePath="..\common\faad\getopt.c">
+			</File>
 			<File
-				RelativePath=".\main.c"/>
+				RelativePath=".\main.c">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath=".\audio.h"/>
+				RelativePath=".\audio.h">
+			</File>
 			<File
-				RelativePath="..\include\faad.h"/>
+				RelativePath="..\include\faad.h">
+			</File>
 			<File
-				RelativePath="..\common\faad\getopt.h"/>
+				RelativePath="..\common\faad\getopt.h">
+			</File>
 			<File
-				RelativePath="..\common\mp4v2\mp4.h"/>
+				RelativePath="..\common\mp4v2\mp4.h">
+			</File>
 			<File
-				RelativePath="..\common\mp4v2\mpeg4ip.h"/>
+				RelativePath="..\common\mp4v2\mpeg4ip.h">
+			</File>
 			<File
-				RelativePath="..\common\mp4v2\systems.h"/>
+				RelativePath="..\common\mp4v2\systems.h">
+			</File>
 			<File
-				RelativePath="..\common\mp4v2\win32_ver.h"/>
+				RelativePath="..\common\mp4v2\win32_ver.h">
+			</File>
 		</Filter>
 	</Files>
-	<Globals/>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
--- a/include/faad.h
+++ b/include/faad.h
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: faad.h,v 1.38 2004/01/06 11:59:48 menno Exp $
+** $Id: faad.h,v 1.39 2004/02/06 10:23:28 menno Exp $
 **/
 
 #ifndef __AACDEC_H__
@@ -43,7 +43,7 @@
   #endif
 #endif
 
-#define FAAD2_VERSION "2.0 RC3 "
+#define FAAD2_VERSION "2.0     "
 
 /* object types for AAC */
 #define MAIN       1
--- a/libfaad/libfaad.vcproj
+++ b/libfaad/libfaad.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -21,6 +21,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@@ -35,27 +36,14 @@
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE">
-				<IntelOptions
-					Optimization="2"
-					InlineFunctionExpansion="1"
-					OmitFramePointers="1"
-					OptimizeForProcessor="2"
-					StringPooling="1"
-					RuntimeLibrary="2"
-					BufferSecurityCheck="1"
-					EnableFunctionLevelLinking="1"
-					AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TP"/>
-			</Tool>
+				Detect64BitPortabilityProblems="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalOptions=""
 				OutputFile=".\Release\libfaad.lib"
-				SuppressStartupBanner="TRUE">
-				<IntelOptions
-					AllOptions="/OUT:&quot;.\Release\libfaad.lib&quot; /NOLOGO"/>
-			</Tool>
+				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -76,8 +64,6 @@
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-			<IntelOptions
-				CompilerName="1"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
@@ -89,10 +75,11 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="0"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile=".\Debug/libfaad.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -100,23 +87,14 @@
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4">
-				<IntelOptions
-					Optimization="0"
-					MinimalRebuild="1"
-					BasicRuntimeChecks="3"
-					RuntimeLibrary="1"
-					AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TP"/>
-			</Tool>
+				DebugInformationFormat="4"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalOptions=""
 				OutputFile=".\Debug\libfaad.lib"
-				SuppressStartupBanner="TRUE">
-				<IntelOptions
-					AllOptions="/OUT:&quot;.\Debug\libfaad.lib&quot; /NOLOGO"/>
-			</Tool>
+				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -137,11 +115,10 @@
 				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-			<IntelOptions
-				CompilerName="1"/>
 		</Configuration>
 	</Configurations>
-	<References/>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
@@ -152,25 +129,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -179,25 +149,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -206,25 +169,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -233,25 +189,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -260,25 +209,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -287,25 +229,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -314,25 +249,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -341,25 +269,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -368,25 +289,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -395,25 +309,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -422,25 +329,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -449,25 +349,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -476,25 +369,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -503,25 +389,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -530,25 +409,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -557,25 +429,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -584,25 +449,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -611,25 +469,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -638,25 +489,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -665,25 +509,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -692,25 +529,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -719,25 +549,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -746,25 +569,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -773,25 +589,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -800,25 +609,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -827,25 +629,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -854,25 +649,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -881,25 +669,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -908,25 +689,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -935,25 +709,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -962,25 +729,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -989,25 +749,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1016,25 +769,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1043,25 +789,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -1070,25 +809,18 @@
 					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="2"
-						PreprocessorDefinitions="">
-						<IntelOptions
-							Optimization="2"
-							AllOptions="/c  /nologo /W3 /Wp64 /O2 /Ob1 /Oy /G6 /D &quot;NDEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /GF /FD /EHsc /MD /GS /Gy /YX&quot;StdAfx.h&quot; /Fp&quot;.\Release/libfaad.pch&quot; /Fo&quot;.\Release/&quot; /Fd&quot;.\Release/&quot; /Gd /TC"/>
-					</Tool>
+						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
+						AdditionalOptions=""
 						Optimization="0"
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3">
-						<IntelOptions
-							Optimization="0"
-							BasicRuntimeChecks="3"
-							AllOptions="/c  /ZI /nologo /W3 /Od /D &quot;_DEBUG&quot; /D &quot;WIN32&quot; /D &quot;_LIB&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MTd /YX&quot;StdAfx.h&quot; /Fp&quot;.\Debug/libfaad.pch&quot; /Fo&quot;.\Debug/&quot; /Fd&quot;.\Debug/&quot; /Gd /TC"/>
-					</Tool>
+						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -1096,116 +828,170 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="analysis.h"/>
+				RelativePath="analysis.h">
+			</File>
 			<File
-				RelativePath="bits.h"/>
+				RelativePath="bits.h">
+			</File>
 			<File
-				RelativePath="cfft.h"/>
+				RelativePath="cfft.h">
+			</File>
 			<File
-				RelativePath="cfft_tab.h"/>
+				RelativePath="cfft_tab.h">
+			</File>
 			<File
-				RelativePath="common.h"/>
+				RelativePath="common.h">
+			</File>
 			<File
-				RelativePath="decoder.h"/>
+				RelativePath="decoder.h">
+			</File>
 			<File
-				RelativePath="drc.h"/>
+				RelativePath="drc.h">
+			</File>
 			<File
-				RelativePath="error.h"/>
+				RelativePath="error.h">
+			</File>
 			<File
-				RelativePath="filtbank.h"/>
+				RelativePath="filtbank.h">
+			</File>
 			<File
-				RelativePath="fixed.h"/>
+				RelativePath="fixed.h">
+			</File>
 			<File
-				RelativePath="codebook\hcb.h"/>
+				RelativePath="codebook\hcb.h">
+			</File>
 			<File
-				RelativePath="huffman.h"/>
+				RelativePath="huffman.h">
+			</File>
 			<File
-				RelativePath="ic_predict.h"/>
+				RelativePath="ic_predict.h">
+			</File>
 			<File
-				RelativePath="iq_table.h"/>
+				RelativePath="iq_table.h">
+			</File>
 			<File
-				RelativePath="is.h"/>
+				RelativePath="is.h">
+			</File>
 			<File
-				RelativePath="kbd_win.h"/>
+				RelativePath="kbd_win.h">
+			</File>
 			<File
-				RelativePath="lt_predict.h"/>
+				RelativePath="lt_predict.h">
+			</File>
 			<File
-				RelativePath="mdct.h"/>
+				RelativePath="mdct.h">
+			</File>
 			<File
-				RelativePath="mp4.h"/>
+				RelativePath="mp4.h">
+			</File>
 			<File
-				RelativePath="ms.h"/>
+				RelativePath="ms.h">
+			</File>
 			<File
-				RelativePath="output.h"/>
+				RelativePath="output.h">
+			</File>
 			<File
-				RelativePath="pns.h"/>
+				RelativePath="pns.h">
+			</File>
 			<File
-				RelativePath="pulse.h"/>
+				RelativePath="pulse.h">
+			</File>
 			<File
-				RelativePath="rvlc.h"/>
+				RelativePath="rvlc.h">
+			</File>
 			<File
-				RelativePath="sbr_dct.h"/>
+				RelativePath="sbr_dct.h">
+			</File>
 			<File
-				RelativePath="sbr_dec.h"/>
+				RelativePath="sbr_dec.h">
+			</File>
 			<File
-				RelativePath="sbr_e_nf.h"/>
+				RelativePath="sbr_e_nf.h">
+			</File>
 			<File
-				RelativePath="sbr_fbt.h"/>
+				RelativePath="sbr_fbt.h">
+			</File>
 			<File
-				RelativePath="sbr_hfadj.h"/>
+				RelativePath="sbr_hfadj.h">
+			</File>
 			<File
-				RelativePath="sbr_hfgen.h"/>
+				RelativePath="sbr_hfgen.h">
+			</File>
 			<File
-				RelativePath="sbr_huff.h"/>
+				RelativePath="sbr_huff.h">
+			</File>
 			<File
-				RelativePath="sbr_noise.h"/>
+				RelativePath="sbr_noise.h">
+			</File>
 			<File
-				RelativePath="sbr_qmf.h"/>
+				RelativePath="sbr_qmf.h">
+			</File>
 			<File
-				RelativePath="sbr_syntax.h"/>
+				RelativePath="sbr_syntax.h">
+			</File>
 			<File
-				RelativePath="sbr_tf_grid.h"/>
+				RelativePath="sbr_tf_grid.h">
+			</File>
 			<File
-				RelativePath="sine_win.h"/>
+				RelativePath="sine_win.h">
+			</File>
 			<File
-				RelativePath="specrec.h"/>
+				RelativePath="specrec.h">
+			</File>
 			<File
-				RelativePath="ssr.h"/>
+				RelativePath="ssr.h">
+			</File>
 			<File
-				RelativePath="structs.h"/>
+				RelativePath="structs.h">
+			</File>
 			<File
-				RelativePath="syntax.h"/>
+				RelativePath="syntax.h">
+			</File>
 			<File
-				RelativePath="tns.h"/>
+				RelativePath="tns.h">
+			</File>
 			<Filter
 				Name="codebook"
 				Filter="">
 				<File
-					RelativePath="codebook\hcb_1.h"/>
+					RelativePath="codebook\hcb_1.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_10.h"/>
+					RelativePath="codebook\hcb_10.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_11.h"/>
+					RelativePath="codebook\hcb_11.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_2.h"/>
+					RelativePath="codebook\hcb_2.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_3.h"/>
+					RelativePath="codebook\hcb_3.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_4.h"/>
+					RelativePath="codebook\hcb_4.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_5.h"/>
+					RelativePath="codebook\hcb_5.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_6.h"/>
+					RelativePath="codebook\hcb_6.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_7.h"/>
+					RelativePath="codebook\hcb_7.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_8.h"/>
+					RelativePath="codebook\hcb_8.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_9.h"/>
+					RelativePath="codebook\hcb_9.h">
+				</File>
 				<File
-					RelativePath="codebook\hcb_sf.h"/>
+					RelativePath="codebook\hcb_sf.h">
+				</File>
 			</Filter>
 		</Filter>
 	</Files>
-	<Globals/>
+	<Globals>
+	</Globals>
 </VisualStudioProject>