Mercurial > mplayer.hg

comparison libfaad2/mp4.c @ 12527:4a370c80fe5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update to the 2.0 release of faad, patch by adland
author diego
date Wed, 02 Jun 2004 22:59:04 +0000
parents 3185f64f6350
children d81145997036
comparison
equal deleted inserted replaced
12526:e183ad37d24c 12527:4a370c80fe5c
1 /* 1 /*
2 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding 2 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
3 ** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com 3 ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
4 ** 4 **
5 ** This program is free software; you can redistribute it and/or modify 5 ** This program is free software; you can redistribute it and/or modify
6 ** it under the terms of the GNU General Public License as published by 6 ** it under the terms of the GNU General Public License as published by
7 ** the Free Software Foundation; either version 2 of the License, or 7 ** the Free Software Foundation; either version 2 of the License, or
8 ** (at your option) any later version. 8 ** (at your option) any later version.
20 ** forbidden. 20 ** forbidden.
21 ** 21 **
22 ** Commercial non-GPL licensing of this software is possible. 22 ** Commercial non-GPL licensing of this software is possible.
23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. 23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
24 ** 24 **
25 ** $Id: mp4.c,v 1.19 2003/09/18 13:38:38 menno Exp $ 25 ** $Id: mp4.c,v 1.2 2003/10/03 22:22:27 alex Exp $
26 **/ 26 **/
27 27
28 #include "common.h" 28 #include "common.h"
29 #include "structs.h" 29 #include "structs.h"
30 30
56 #ifdef SBR_DEC 56 #ifdef SBR_DEC
57 1, /* 5 SBR */ 57 1, /* 5 SBR */
58 #else 58 #else
59 0, /* 5 SBR */ 59 0, /* 5 SBR */
60 #endif 60 #endif
61 #ifdef SCALABLE_DEC
62 1, /* 6 AAC Scalable */
63 #else
61 0, /* 6 AAC Scalable */ 64 0, /* 6 AAC Scalable */
65 #endif
62 0, /* 7 TwinVQ */ 66 0, /* 7 TwinVQ */
63 0, /* 8 CELP */ 67 0, /* 8 CELP */
64 0, /* 9 HVXC */ 68 0, /* 9 HVXC */
65 0, /* 10 Reserved */ 69 0, /* 10 Reserved */
66 0, /* 11 Reserved */ 70 0, /* 11 Reserved */
77 #ifdef LTP_DEC 81 #ifdef LTP_DEC
78 1, /* 19 ER AAC LTP */ 82 1, /* 19 ER AAC LTP */
79 #else 83 #else
80 0, /* 19 ER AAC LTP */ 84 0, /* 19 ER AAC LTP */
81 #endif 85 #endif
86 #ifdef SCALABLE_DEC
87 1, /* 20 ER AAC scalable */
88 #else
82 0, /* 20 ER AAC scalable */ 89 0, /* 20 ER AAC scalable */
90 #endif
83 0, /* 21 ER TwinVQ */ 91 0, /* 21 ER TwinVQ */
84 0, /* 22 ER BSAC */ 92 0, /* 22 ER BSAC */
85 #ifdef LD_DEC 93 #ifdef LD_DEC
86 1, /* 23 ER AAC LD */ 94 1, /* 23 ER AAC LD */
87 #else 95 #else