diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-10-29 23:57:06 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-10-29 23:57:06 +0000 |
| commit | 03ac29c63fd3d5019c67b3662669b1c443896f0b (patch) | |
| tree | 00db769b2943fce16b9967591652d2c0724be168 /src/libfaad/syntax.h | |
| parent | c7976c4d0d8d02fa18bc9fd82bafe99e333e2a53 (diff) | |
| download | xine-lib-03ac29c63fd3d5019c67b3662669b1c443896f0b.tar.gz xine-lib-03ac29c63fd3d5019c67b3662669b1c443896f0b.tar.bz2 | |
update libfaad2 to CVS snapshot 2004-09-15
CVS patchset: 7777
CVS date: 2005/10/29 23:57:06
Diffstat (limited to 'src/libfaad/syntax.h')
| -rw-r--r-- | src/libfaad/syntax.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libfaad/syntax.h b/src/libfaad/syntax.h index c9b3a32e5..a047dd644 100644 --- a/src/libfaad/syntax.h +++ b/src/libfaad/syntax.h @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: syntax.h,v 1.9 2004/12/03 01:15:31 tmattern Exp $ +** $Id: syntax.h,v 1.10 2005/10/29 23:57:07 tmmm Exp $ **/ #ifndef __SYNTAX_H__ @@ -60,8 +60,8 @@ extern "C" { #define DRMCH_MONO 1 #define DRMCH_STEREO 2 #define DRMCH_SBR_MONO 3 -#define DRMCH_SBR_LC_STEREO 4 -#define DRMCH_SBR_STEREO 5 +#define DRMCH_SBR_STEREO 4 +#define DRMCH_SBR_PS_STEREO 5 /* First object type that has ER */ @@ -110,10 +110,12 @@ int8_t GASpecificConfig(bitfile *ld, mp4AudioSpecificConfig *mp4ASC, uint8_t adts_frame(adts_header *adts, bitfile *ld); void get_adif_header(adif_header *adif, bitfile *ld); -void raw_data_block(faacDecHandle hDecoder, faacDecFrameInfo *hInfo, +void raw_data_block(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, bitfile *ld, program_config *pce, drc_info *drc); -uint8_t reordered_spectral_data(faacDecHandle hDecoder, ic_stream *ics, bitfile *ld, +uint8_t reordered_spectral_data(NeAACDecHandle hDecoder, ic_stream *ics, bitfile *ld, int16_t *spectral_data); +void aac_scalable_main_element(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, + bitfile *ld, program_config *pce, drc_info *drc); #ifdef __cplusplus |