diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-24 17:31:36 +0000 |
| commit | e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8 (patch) | |
| tree | 8553b3a4ef8164d14ff1b4a3f67e57cfa1d8908a /libfaad2/syntax.h | |
| parent | 2887bacbdb6bd320e4840fd230e92a59cc74b9ae (diff) | |
| download | mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.bz2 mpv-e1ece5e2eb68c81b1645c9ff989c833c4d67dfd8.tar.xz | |
Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
patch by adland <adland123 at yahoo dot com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/syntax.h')
| -rw-r--r-- | libfaad2/syntax.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libfaad2/syntax.h b/libfaad2/syntax.h index 7287f0ca68..5a7c3a43d8 100644 --- a/libfaad2/syntax.h +++ b/libfaad2/syntax.h @@ -23,7 +23,7 @@ ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30 -** $Id: syntax.h,v 1.3 2004/06/02 22:59:04 diego Exp $ +** $Id: syntax.h,v 1.4 2004/06/23 13:50:53 diego Exp $ ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ **/ @@ -62,8 +62,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 */ @@ -112,10 +112,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 |