summaryrefslogtreecommitdiff
path: root/src/libfaad/lt_predict.h
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-08-13 14:28:30 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-08-13 14:28:30 +0100
commite8cc3903fc5be11c0e326fc23650599dbb1d07a0 (patch)
tree45c2bff1062583269fc745a54dcc1df048cbd62a /src/libfaad/lt_predict.h
parent3a6da3fcaef64afe71e1e1a0d41baca0872e98f8 (diff)
downloadxine-lib-e8cc3903fc5be11c0e326fc23650599dbb1d07a0.tar.gz
xine-lib-e8cc3903fc5be11c0e326fc23650599dbb1d07a0.tar.bz2
Update to libfaad 2.6.1, fixing a crash with a corrupted AAC file.
Source is the version in the 1.2 branch.
Diffstat (limited to 'src/libfaad/lt_predict.h')
-rw-r--r--src/libfaad/lt_predict.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libfaad/lt_predict.h b/src/libfaad/lt_predict.h
index faa2fbca7..117f83424 100644
--- a/src/libfaad/lt_predict.h
+++ b/src/libfaad/lt_predict.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: lt_predict.h,v 1.7 2005/10/29 23:57:07 tmmm Exp $
+** $Id: lt_predict.h,v 1.20 2007/11/01 12:33:31 menno Exp $
**/
#ifdef LTP_DEC