diff options
Diffstat (limited to 'libfaad2/mp4.c')
| -rw-r--r-- | libfaad2/mp4.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libfaad2/mp4.c b/libfaad2/mp4.c index ef8ecf0c5a..d4cf430c2d 100644 --- a/libfaad2/mp4.c +++ b/libfaad2/mp4.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,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: mp4.c,v 1.19 2003/09/18 13:38:38 menno Exp $ +** $Id: mp4.c,v 1.2 2003/10/03 22:22:27 alex Exp $ **/ #include "common.h" @@ -58,7 +58,11 @@ static uint8_t ObjectTypesTable[32] = { #else 0, /* 5 SBR */ #endif +#ifdef SCALABLE_DEC + 1, /* 6 AAC Scalable */ +#else 0, /* 6 AAC Scalable */ +#endif 0, /* 7 TwinVQ */ 0, /* 8 CELP */ 0, /* 9 HVXC */ @@ -79,7 +83,11 @@ static uint8_t ObjectTypesTable[32] = { #else 0, /* 19 ER AAC LTP */ #endif +#ifdef SCALABLE_DEC + 1, /* 20 ER AAC scalable */ +#else 0, /* 20 ER AAC scalable */ +#endif 0, /* 21 ER TwinVQ */ 0, /* 22 ER BSAC */ #ifdef LD_DEC |