diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-02 22:59:04 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-06-02 22:59:04 +0000 |
| commit | 228ca70d485e2660c2e381d7112cbcca65c156a0 (patch) | |
| tree | f7ab4303f2daa68c76271787a60d50cb1ada2e46 /libfaad2/error.c | |
| parent | eb1dee5cbf86fba8d5081bae6071cc4a4fd68306 (diff) | |
| download | mpv-228ca70d485e2660c2e381d7112cbcca65c156a0.tar.bz2 mpv-228ca70d485e2660c2e381d7112cbcca65c156a0.tar.xz | |
update to the 2.0 release of faad, patch by adland
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12528 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/error.c')
| -rw-r--r-- | libfaad2/error.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/libfaad2/error.c b/libfaad2/error.c index 51f43553dd..a148053197 100644 --- a/libfaad2/error.c +++ b/libfaad2/error.c @@ -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-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 @@ -22,13 +22,13 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: error.c,v 1.10 2003/07/29 08:20:12 menno Exp $ +** $Id: error.c,v 1.1 2003/08/30 22:30:21 arpi Exp $ **/ #include "common.h" #include "error.h" -extern int8_t *err_msg[] = { +int8_t *err_msg[] = { "No error", "Gain control not yet implemented", "Pulse coding not allowed in short blocks", @@ -41,9 +41,19 @@ extern int8_t *err_msg[] = { "Error decoding huffman scalefactor (bitstream error)", "Error decoding huffman codeword (bitstream error)", "Non existent huffman codebook number found", - "Maximum number of channels exceeded", + "Invalid number of channels", "Maximum number of bitstream elements exceeded", "Input data buffer too small", "Array index out of range", - "Maximum number of scalefactor bands exceeded" -};
\ No newline at end of file + "Maximum number of scalefactor bands exceeded", + "Quantised value out of range", + "LTP lag out of range", + "Invalid SBR parameter decoded", + "SBR called without being initialised", + "Unexpected channel configuration change", + "Error in program_config_element", + "First SBR frame is not the same as first AAC frame", + "Unexpected fill element with SBR data", + "Not all elements were provided with SBR data" +}; + |