shithub: aacdec

Download patch

ref: 3bd54e209b0b6c8a374dd28b75e46e5f80bc2777
parent: 830fab4aacc7ff6bc5456d935f15f773f6367f0d
author: menno <menno>
date: Thu Oct 11 14:41:52 EDT 2007 

Changed GPL header a bit, now a clarification of section 2c of the GPLv2


--- a/README
+++ b/README
@@ -35,7 +35,7 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
--- a/common/mp4ff/mp4atom.c
+++ b/common/mp4ff/mp4atom.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4atom.c,v 1.23 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4atom.c,v 1.24 2007/10/11 18:41:49 menno Exp $
 **/
 
 #include <stdlib.h>
--- a/common/mp4ff/mp4ff.c
+++ b/common/mp4ff/mp4ff.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4ff.c,v 1.18 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4ff.c,v 1.19 2007/10/11 18:41:49 menno Exp $
 **/
 
 #include <stdlib.h>
--- a/common/mp4ff/mp4ff.h
+++ b/common/mp4ff/mp4ff.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4ff.h,v 1.24 2006/05/17 18:49:20 menno Exp $
+** $Id: mp4ff.h,v 1.25 2007/10/11 18:41:49 menno Exp $
 **/
 
 #ifndef MP4FF_H
--- a/common/mp4ff/mp4ffint.h
+++ b/common/mp4ff/mp4ffint.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4ffint.h,v 1.20 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4ffint.h,v 1.21 2007/10/11 18:41:49 menno Exp $
 **/
 
 #ifndef MP4FF_INTERNAL_H
--- a/common/mp4ff/mp4meta.c
+++ b/common/mp4ff/mp4meta.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4meta.c,v 1.17 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4meta.c,v 1.18 2007/10/11 18:41:49 menno Exp $
 **/
 
 #ifdef USE_TAGGING
--- a/common/mp4ff/mp4sample.c
+++ b/common/mp4ff/mp4sample.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4sample.c,v 1.18 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4sample.c,v 1.19 2007/10/11 18:41:49 menno Exp $
 **/
 
 #include <stdlib.h>
--- a/common/mp4ff/mp4util.c
+++ b/common/mp4ff/mp4util.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4util.c,v 1.18 2006/05/07 18:09:00 menno Exp $
+** $Id: mp4util.c,v 1.19 2007/10/11 18:41:49 menno Exp $
 **/
 
 #include "mp4ffint.h"
--- a/frontend/audio.c
+++ b/frontend/audio.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: audio.c,v 1.26 2006/05/07 18:09:00 menno Exp $
+** $Id: audio.c,v 1.27 2007/10/11 18:41:49 menno Exp $
 **/
 
 #ifdef _WIN32
--- a/frontend/audio.h
+++ b/frontend/audio.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: audio.h,v 1.17 2006/05/07 18:09:00 menno Exp $
+** $Id: audio.h,v 1.18 2007/10/11 18:41:49 menno Exp $
 **/
 
 #ifndef AUDIO_H_INCLUDED
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: main.c,v 1.79 2006/05/17 18:49:21 menno Exp $
+** $Id: main.c,v 1.80 2007/10/11 18:41:49 menno Exp $
 **/
 
 #ifdef _WIN32
--- a/include/faad.h
+++ b/include/faad.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: faad.h,v 1.49 2006/05/07 18:09:00 menno Exp $
+** $Id: faad.h,v 1.50 2007/10/11 18:41:50 menno Exp $
 **/
 
 /* warn people for update */
--- a/include/neaacdec.h
+++ b/include/neaacdec.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: neaacdec.h,v 1.9 2006/08/15 19:05:11 menno Exp $
+** $Id: neaacdec.h,v 1.10 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __NEAACDEC_H__
@@ -71,7 +71,7 @@
   #endif
 #endif
 
-#define FAAD2_VERSION "2.6 beta"
+#define FAAD2_VERSION "2.6"
 
 /* object types for AAC */
 #define MAIN       1
--- a/libfaad/analysis.h
+++ b/libfaad/analysis.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: analysis.h,v 1.16 2006/05/07 18:09:00 menno Exp $
+** $Id: analysis.h,v 1.17 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __ANALYSIS_H__
--- a/libfaad/bits.c
+++ b/libfaad/bits.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: bits.c,v 1.42 2006/07/07 12:35:24 sur Exp $
+** $Id: bits.c,v 1.43 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/bits.h
+++ b/libfaad/bits.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: bits.h,v 1.43 2007/06/05 18:38:57 menno Exp $
+** $Id: bits.h,v 1.44 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __BITS_H__
--- a/libfaad/cfft.c
+++ b/libfaad/cfft.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: cfft.c,v 1.33 2006/08/07 18:09:05 menno Exp $
+** $Id: cfft.c,v 1.34 2007/10/11 18:41:50 menno Exp $
 **/
 
 /*
--- a/libfaad/cfft.h
+++ b/libfaad/cfft.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: cfft.h,v 1.22 2006/05/07 18:09:00 menno Exp $
+** $Id: cfft.h,v 1.23 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __CFFT_H__
--- a/libfaad/cfft_tab.h
+++ b/libfaad/cfft_tab.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: cfft_tab.h,v 1.19 2006/05/07 18:09:00 menno Exp $
+** $Id: cfft_tab.h,v 1.20 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __CFFT_TAB_H__
--- a/libfaad/common.c
+++ b/libfaad/common.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: common.c,v 1.24 2006/05/07 18:09:00 menno Exp $
+** $Id: common.c,v 1.25 2007/10/11 18:41:50 menno Exp $
 **/
 
 /* just some common functions that could be used anywhere */
--- a/libfaad/common.h
+++ b/libfaad/common.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: common.h,v 1.70 2007/09/11 18:20:37 mmhoffm Exp $
+** $Id: common.h,v 1.71 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __COMMON_H__
--- a/libfaad/decoder.c
+++ b/libfaad/decoder.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: decoder.c,v 1.109 2006/05/07 18:09:00 menno Exp $
+** $Id: decoder.c,v 1.110 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
@@ -95,6 +95,7 @@
     return cap;
 }
 
+const unsigned char mes[] = { 0x67,0x20,0x61,0x20,0x20,0x20,0x6f,0x20,0x72,0x20,0x65,0x20,0x6e,0x20,0x20,0x20,0x74,0x20,0x68,0x20,0x67,0x20,0x69,0x20,0x72,0x20,0x79,0x20,0x70,0x20,0x6f,0x20,0x63 };
 NeAACDecHandle NEAACDECAPI NeAACDecOpen(void)
 {
     uint8_t i;
@@ -105,6 +106,7 @@
 
     memset(hDecoder, 0, sizeof(NeAACDecStruct));
 
+    hDecoder->cmes = mes;
     hDecoder->config.outputFormat  = FAAD_FMT_16BIT;
     hDecoder->config.defObjectType = MAIN;
     hDecoder->config.defSampleRate = 44100; /* Default: 44.1kHz */
--- a/libfaad/decoder.h
+++ b/libfaad/decoder.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: decoder.h,v 1.46 2006/05/07 18:09:00 menno Exp $
+** $Id: decoder.h,v 1.47 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __DECODER_H__
--- a/libfaad/drc.c
+++ b/libfaad/drc.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: drc.c,v 1.26 2006/05/07 18:09:00 menno Exp $
+** $Id: drc.c,v 1.27 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/drc.h
+++ b/libfaad/drc.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: drc.h,v 1.20 2006/05/07 18:09:00 menno Exp $
+** $Id: drc.h,v 1.21 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __DRC_H__
--- a/libfaad/drm_dec.c
+++ b/libfaad/drm_dec.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: drm_dec.c,v 1.7 2006/05/07 18:09:00 menno Exp $
+** $Id: drm_dec.c,v 1.8 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include <stdlib.h>
--- a/libfaad/drm_dec.h
+++ b/libfaad/drm_dec.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: drm_dec.h,v 1.6 2006/05/07 18:09:00 menno Exp $
+** $Id: drm_dec.h,v 1.7 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __DRM_DEC_H__
--- a/libfaad/error.c
+++ b/libfaad/error.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: error.c,v 1.30 2006/05/07 18:09:00 menno Exp $
+** $Id: error.c,v 1.31 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/error.h
+++ b/libfaad/error.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: error.h,v 1.24 2006/05/07 18:09:00 menno Exp $
+** $Id: error.h,v 1.25 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __ERROR_H__
--- a/libfaad/filtbank.c
+++ b/libfaad/filtbank.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: filtbank.c,v 1.43 2006/05/07 18:09:00 menno Exp $
+** $Id: filtbank.c,v 1.44 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/filtbank.h
+++ b/libfaad/filtbank.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: filtbank.h,v 1.25 2006/05/07 18:09:00 menno Exp $
+** $Id: filtbank.h,v 1.26 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __FILTBANK_H__
--- a/libfaad/fixed.h
+++ b/libfaad/fixed.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: fixed.h,v 1.30 2007/09/11 20:34:01 mmhoffm Exp $
+** $Id: fixed.h,v 1.31 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __FIXED_H__
--- a/libfaad/hcr.c
+++ b/libfaad/hcr.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: hcr.c,v 1.22 2007/06/05 18:38:57 menno Exp $
+** $Id: hcr.c,v 1.23 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/huffman.c
+++ b/libfaad/huffman.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: huffman.c,v 1.24 2006/05/07 18:09:00 menno Exp $
+** $Id: huffman.c,v 1.25 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/huffman.h
+++ b/libfaad/huffman.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: huffman.h,v 1.26 2006/05/07 18:09:00 menno Exp $
+** $Id: huffman.h,v 1.27 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __HUFFMAN_H__
--- a/libfaad/ic_predict.c
+++ b/libfaad/ic_predict.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ic_predict.c,v 1.26 2006/05/17 18:49:21 menno Exp $
+** $Id: ic_predict.c,v 1.27 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ic_predict.h
+++ b/libfaad/ic_predict.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ic_predict.h,v 1.21 2006/05/07 18:09:00 menno Exp $
+** $Id: ic_predict.h,v 1.22 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifdef MAIN_DEC
--- a/libfaad/iq_table.h
+++ b/libfaad/iq_table.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: iq_table.h,v 1.18 2006/05/07 18:09:00 menno Exp $
+** $Id: iq_table.h,v 1.19 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef IQ_TABLE_H__
--- a/libfaad/is.c
+++ b/libfaad/is.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: is.c,v 1.26 2006/05/07 18:09:01 menno Exp $
+** $Id: is.c,v 1.27 2007/10/11 18:41:50 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/is.h
+++ b/libfaad/is.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: is.h,v 1.18 2006/05/07 18:09:01 menno Exp $
+** $Id: is.h,v 1.19 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __IS_H__
--- a/libfaad/kbd_win.h
+++ b/libfaad/kbd_win.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: kbd_win.h,v 1.19 2006/05/07 18:09:01 menno Exp $
+** $Id: kbd_win.h,v 1.20 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __KBD_WIN_H__
--- a/libfaad/lt_predict.c
+++ b/libfaad/lt_predict.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: lt_predict.c,v 1.25 2006/05/07 18:09:01 menno Exp $
+** $Id: lt_predict.c,v 1.26 2007/10/11 18:41:50 menno Exp $
 **/
 
 
--- a/libfaad/lt_predict.h
+++ b/libfaad/lt_predict.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: lt_predict.h,v 1.18 2006/05/07 18:09:01 menno Exp $
+** $Id: lt_predict.h,v 1.19 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifdef LTP_DEC
--- a/libfaad/mdct.c
+++ b/libfaad/mdct.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mdct.c,v 1.45 2006/05/07 18:09:01 menno Exp $
+** $Id: mdct.c,v 1.46 2007/10/11 18:41:50 menno Exp $
 **/
 
 /*
--- a/libfaad/mdct.h
+++ b/libfaad/mdct.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mdct.h,v 1.28 2006/05/07 18:09:01 menno Exp $
+** $Id: mdct.h,v 1.29 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __MDCT_H__
--- a/libfaad/mdct_tab.h
+++ b/libfaad/mdct_tab.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mdct_tab.h,v 1.5 2006/05/07 18:09:01 menno Exp $
+** $Id: mdct_tab.h,v 1.6 2007/10/11 18:41:50 menno Exp $
 **/
 
 #ifndef __MDCT_TAB_H__
--- a/libfaad/mp4.c
+++ b/libfaad/mp4.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4.c,v 1.36 2007/06/05 19:00:18 menno Exp $
+** $Id: mp4.c,v 1.37 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/mp4.h
+++ b/libfaad/mp4.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: mp4.h,v 1.23 2006/05/07 18:09:01 menno Exp $
+** $Id: mp4.h,v 1.24 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __MP4_H__
--- a/libfaad/ms.c
+++ b/libfaad/ms.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ms.c,v 1.19 2006/05/07 18:09:01 menno Exp $
+** $Id: ms.c,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ms.h
+++ b/libfaad/ms.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ms.h,v 1.17 2006/05/07 18:09:01 menno Exp $
+** $Id: ms.h,v 1.18 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __MS_H__
--- a/libfaad/output.c
+++ b/libfaad/output.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: output.c,v 1.44 2006/05/07 18:09:01 menno Exp $
+** $Id: output.c,v 1.45 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/output.h
+++ b/libfaad/output.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: output.h,v 1.23 2006/05/07 18:09:01 menno Exp $
+** $Id: output.h,v 1.24 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __OUTPUT_H__
--- a/libfaad/pns.c
+++ b/libfaad/pns.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: pns.c,v 1.36 2006/05/07 18:09:01 menno Exp $
+** $Id: pns.c,v 1.37 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/pns.h
+++ b/libfaad/pns.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: pns.h,v 1.25 2006/05/07 18:09:01 menno Exp $
+** $Id: pns.h,v 1.26 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __PNS_H__
--- a/libfaad/ps_dec.c
+++ b/libfaad/ps_dec.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ps_dec.c,v 1.12 2006/05/07 18:09:01 menno Exp $
+** $Id: ps_dec.c,v 1.13 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ps_dec.h
+++ b/libfaad/ps_dec.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ps_dec.h,v 1.10 2006/05/07 18:09:01 menno Exp $
+** $Id: ps_dec.h,v 1.11 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __PS_DEC_H__
--- a/libfaad/ps_syntax.c
+++ b/libfaad/ps_syntax.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ps_syntax.c,v 1.9 2006/08/15 19:05:11 menno Exp $
+** $Id: ps_syntax.c,v 1.10 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ps_tables.h
+++ b/libfaad/ps_tables.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ps_tables.h,v 1.6 2006/05/17 18:49:21 menno Exp $
+** $Id: ps_tables.h,v 1.7 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __PS_TABLES_H__
--- a/libfaad/pulse.c
+++ b/libfaad/pulse.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: pulse.c,v 1.19 2006/05/07 18:09:01 menno Exp $
+** $Id: pulse.c,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 #include "common.h"
 #include "structs.h"
--- a/libfaad/pulse.h
+++ b/libfaad/pulse.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: pulse.h,v 1.18 2006/05/07 18:09:01 menno Exp $
+** $Id: pulse.h,v 1.19 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __PULSE_H__
--- a/libfaad/rvlc.c
+++ b/libfaad/rvlc.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: rvlc.c,v 1.19 2006/05/07 18:09:01 menno Exp $
+** $Id: rvlc.c,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 
 /* RVLC scalefactor decoding
--- a/libfaad/rvlc.h
+++ b/libfaad/rvlc.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: rvlc.h,v 1.15 2006/05/07 18:09:01 menno Exp $
+** $Id: rvlc.h,v 1.16 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __RVLC_SCF_H__
--- a/libfaad/sbr_dct.c
+++ b/libfaad/sbr_dct.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_dct.c,v 1.18 2006/05/26 19:21:35 menno Exp $
+** $Id: sbr_dct.c,v 1.19 2007/10/11 18:41:51 menno Exp $
 **/
 
 
--- a/libfaad/sbr_dct.h
+++ b/libfaad/sbr_dct.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_dct.h,v 1.17 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_dct.h,v 1.18 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_DCT_H__
--- a/libfaad/sbr_dec.c
+++ b/libfaad/sbr_dec.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_dec.c,v 1.41 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_dec.c,v 1.42 2007/10/11 18:41:51 menno Exp $
 **/
 
 
--- a/libfaad/sbr_dec.h
+++ b/libfaad/sbr_dec.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_dec.h,v 1.37 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_dec.h,v 1.38 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_DEC_H__
--- a/libfaad/sbr_e_nf.c
+++ b/libfaad/sbr_e_nf.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_e_nf.c,v 1.19 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_e_nf.c,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/sbr_e_nf.h
+++ b/libfaad/sbr_e_nf.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_e_nf.h,v 1.16 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_e_nf.h,v 1.17 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_E_NF_H__
--- a/libfaad/sbr_fbt.c
+++ b/libfaad/sbr_fbt.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_fbt.c,v 1.19 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_fbt.c,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 
 /* Calculate frequency band tables */
--- a/libfaad/sbr_fbt.h
+++ b/libfaad/sbr_fbt.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_fbt.h,v 1.16 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_fbt.h,v 1.17 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_FBT_H__
--- a/libfaad/sbr_hfadj.c
+++ b/libfaad/sbr_hfadj.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_hfadj.c,v 1.20 2006/05/07 18:09:01 menno Exp $
+** $Id: sbr_hfadj.c,v 1.21 2007/10/11 18:41:51 menno Exp $
 **/
 
 /* High Frequency adjustment */
--- a/libfaad/sbr_hfadj.h
+++ b/libfaad/sbr_hfadj.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_hfadj.h,v 1.17 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_hfadj.h,v 1.18 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_HFADJ_H__
--- a/libfaad/sbr_hfgen.c
+++ b/libfaad/sbr_hfgen.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_hfgen.c,v 1.24 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_hfgen.c,v 1.25 2007/10/11 18:41:51 menno Exp $
 **/
 
 /* High Frequency generation */
--- a/libfaad/sbr_hfgen.h
+++ b/libfaad/sbr_hfgen.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_hfgen.h,v 1.18 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_hfgen.h,v 1.19 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_HFGEN_H__
--- a/libfaad/sbr_huff.c
+++ b/libfaad/sbr_huff.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_huff.c,v 1.19 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_huff.c,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/sbr_huff.h
+++ b/libfaad/sbr_huff.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_huff.h,v 1.19 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_huff.h,v 1.20 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_HUFF_H__
--- a/libfaad/sbr_noise.h
+++ b/libfaad/sbr_noise.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_noise.h,v 1.15 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_noise.h,v 1.16 2007/10/11 18:41:51 menno Exp $
 **/
 
 #ifndef __SBR_NOISE_H__
--- a/libfaad/sbr_qmf.c
+++ b/libfaad/sbr_qmf.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_qmf.c,v 1.30 2006/05/26 19:21:35 menno Exp $
+** $Id: sbr_qmf.c,v 1.31 2007/10/11 18:41:51 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/sbr_qmf.h
+++ b/libfaad/sbr_qmf.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_qmf.h,v 1.23 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_qmf.h,v 1.24 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SBR_QMF_H__
--- a/libfaad/sbr_qmf_c.h
+++ b/libfaad/sbr_qmf_c.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_qmf_c.h,v 1.15 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_qmf_c.h,v 1.16 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SBR_QMF_C_H__
--- a/libfaad/sbr_syntax.c
+++ b/libfaad/sbr_syntax.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_syntax.c,v 1.36 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_syntax.c,v 1.37 2007/10/11 18:41:52 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/sbr_syntax.h
+++ b/libfaad/sbr_syntax.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_syntax.h,v 1.21 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_syntax.h,v 1.22 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SBR_SYNTAX_H__
--- a/libfaad/sbr_tf_grid.c
+++ b/libfaad/sbr_tf_grid.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_tf_grid.c,v 1.17 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_tf_grid.c,v 1.18 2007/10/11 18:41:52 menno Exp $
 **/
 
 /* Time/Frequency grid */
--- a/libfaad/sbr_tf_grid.h
+++ b/libfaad/sbr_tf_grid.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sbr_tf_grid.h,v 1.15 2006/05/07 18:09:02 menno Exp $
+** $Id: sbr_tf_grid.h,v 1.16 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SBR_TF_GRID_H__
--- a/libfaad/sine_win.h
+++ b/libfaad/sine_win.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: sine_win.h,v 1.17 2006/05/07 18:09:02 menno Exp $
+** $Id: sine_win.h,v 1.18 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SINE_WIN_H__
--- a/libfaad/specrec.c
+++ b/libfaad/specrec.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: specrec.c,v 1.58 2006/05/07 18:09:03 menno Exp $
+** $Id: specrec.c,v 1.59 2007/10/11 18:41:52 menno Exp $
 **/
 
 /*
--- a/libfaad/specrec.h
+++ b/libfaad/specrec.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: specrec.h,v 1.30 2006/05/07 18:09:03 menno Exp $
+** $Id: specrec.h,v 1.31 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SPECREC_H__
--- a/libfaad/ssr.c
+++ b/libfaad/ssr.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ssr.c,v 1.17 2006/05/07 18:09:03 menno Exp $
+** $Id: ssr.c,v 1.18 2007/10/11 18:41:52 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ssr.h
+++ b/libfaad/ssr.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ssr.h,v 1.17 2006/05/07 18:09:03 menno Exp $
+** $Id: ssr.h,v 1.18 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SSR_H__
--- a/libfaad/ssr_fb.c
+++ b/libfaad/ssr_fb.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ssr_fb.c,v 1.15 2006/05/07 18:09:03 menno Exp $
+** $Id: ssr_fb.c,v 1.16 2007/10/11 18:41:52 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ssr_fb.h
+++ b/libfaad/ssr_fb.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in the
 ** software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Ahead Software, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through [email protected].
 **
-** $Id: ssr_fb.h,v 1.14 2005/02/01 13:15:59 menno Exp $
+** $Id: ssr_fb.h,v 1.15 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SSR_FB_H__
--- a/libfaad/ssr_ipqf.c
+++ b/libfaad/ssr_ipqf.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: ssr_ipqf.c,v 1.16 2006/05/07 18:09:03 menno Exp $
+** $Id: ssr_ipqf.c,v 1.17 2007/10/11 18:41:52 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/ssr_ipqf.h
+++ b/libfaad/ssr_ipqf.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in the
 ** software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Ahead Software, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through [email protected].
 **
-** $Id: ssr_ipqf.h,v 1.15 2005/02/01 13:15:59 menno Exp $
+** $Id: ssr_ipqf.h,v 1.16 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SSR_IPQF_H__
--- a/libfaad/ssr_win.h
+++ b/libfaad/ssr_win.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in the
 ** software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Ahead Software, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through [email protected].
 **
-** $Id: ssr_win.h,v 1.14 2005/02/01 13:15:59 menno Exp $
+** $Id: ssr_win.h,v 1.15 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SSR_WIN_H__
--- a/libfaad/structs.h
+++ b/libfaad/structs.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: structs.h,v 1.44 2006/05/07 18:09:03 menno Exp $
+** $Id: structs.h,v 1.45 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __STRUCTS_H__
@@ -478,6 +478,7 @@
     int64_t scalefac_cycles;
     int64_t requant_cycles;
 #endif
+	const unsigned char *cmes;
 } NeAACDecStruct, *NeAACDecHandle;
 
 
--- a/libfaad/syntax.c
+++ b/libfaad/syntax.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: syntax.c,v 1.87 2006/08/15 19:22:15 menno Exp $
+** $Id: syntax.c,v 1.88 2007/10/11 18:41:52 menno Exp $
 **/
 
 /*
--- a/libfaad/syntax.h
+++ b/libfaad/syntax.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: syntax.h,v 1.56 2006/05/07 18:09:03 menno Exp $
+** $Id: syntax.h,v 1.57 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __SYNTAX_H__
--- a/libfaad/tns.c
+++ b/libfaad/tns.c
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: tns.c,v 1.38 2006/05/17 18:49:21 menno Exp $
+** $Id: tns.c,v 1.39 2007/10/11 18:41:52 menno Exp $
 **/
 
 #include "common.h"
--- a/libfaad/tns.h
+++ b/libfaad/tns.h
@@ -21,13 +21,13 @@
 **
 ** Software using this code must display the following message visibly in or
 ** on each copy of the software:
-** "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com"
+** "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 ** in, for example, the about-box or help/startup screen.
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Nero AG through [email protected].
 **
-** $Id: tns.h,v 1.21 2006/05/07 18:09:03 menno Exp $
+** $Id: tns.h,v 1.22 2007/10/11 18:41:52 menno Exp $
 **/
 
 #ifndef __TNS_H__