diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-01 19:28:23 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-11-01 19:28:23 +0100 |
| commit | 4eb04918173bb229623e500b376caf391442ac0b (patch) | |
| tree | 407b2717bd4877e8825a062d6c51ff5f842aaa88 /contrib/libfaad/codebook/hcb_6.h | |
| parent | 02a0a73283aed7106e2a2cf49ab1d996df7a93d0 (diff) | |
| download | xine-lib-4eb04918173bb229623e500b376caf391442ac0b.tar.gz xine-lib-4eb04918173bb229623e500b376caf391442ac0b.tar.bz2 | |
Update contributed libfaad (faad2) to version 2.6.1.
Since the release 2.6.1 of faad2 the source code for libfaad is now once again
released under a GPL-compatible license (actually, GPL2 plus commercial
licenses sold by Nero AG, and a note about clarifying who's copyright it is).
As we were using a possibly buggy old CVS snapshot of faad2 from before 2.5
release, the update might fix some buggy AAC files or streams.
The updated xine-lib was tested against iTunes Plus audio files,
Japan-A-Radio stream, SKY.fm streams, and Apple HD trailers, no regression
seems to be present.
Diffstat (limited to 'contrib/libfaad/codebook/hcb_6.h')
| -rw-r--r-- | contrib/libfaad/codebook/hcb_6.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/libfaad/codebook/hcb_6.h b/contrib/libfaad/codebook/hcb_6.h index 12417d997..2181d63d5 100644 --- a/contrib/libfaad/codebook/hcb_6.h +++ b/contrib/libfaad/codebook/hcb_6.h @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2005 M. Bakker, Nero 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 @@ -19,10 +19,13 @@ ** Any non-GPL usage of this software or parts of this software is strictly ** forbidden. ** +** The "appropriate copyright message" mentioned in section 2c of the GPLv2 +** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com" +** ** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. +** For more info contact Nero AG through Mpeg4AAClicense@nero.com. ** -** $Id: hcb_6.h,v 1.4 2005/10/29 23:57:08 tmmm Exp $ +** $Id: hcb_6.h,v 1.5 2007/11/01 12:34:11 menno Exp $ **/ /* 2-step huffman table HCB_6 */ |