From 4eb04918173bb229623e500b376caf391442ac0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 1 Nov 2007 19:28:23 +0100 Subject: 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. --- contrib/libfaad/sbr_tf_grid.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'contrib/libfaad/sbr_tf_grid.h') diff --git a/contrib/libfaad/sbr_tf_grid.h b/contrib/libfaad/sbr_tf_grid.h index 8772a384a..27a8f908e 100644 --- a/contrib/libfaad/sbr_tf_grid.h +++ b/contrib/libfaad/sbr_tf_grid.h @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003-2004 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: sbr_tf_grid.h,v 1.5 2005/10/29 23:57:07 tmmm Exp $ +** $Id: sbr_tf_grid.h,v 1.17 2007/11/01 12:33:36 menno Exp $ **/ #ifndef __SBR_TF_GRID_H__ -- cgit v1.2.3