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/decoder.h | |
| 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/decoder.h')
| -rw-r--r-- | libfaad2/decoder.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/libfaad2/decoder.h b/libfaad2/decoder.h index c77a10ddbc..1fb8cdf424 100644 --- a/libfaad2/decoder.h +++ b/libfaad2/decoder.h @@ -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: decoder.h,v 1.1 2003/08/30 22:30:21 arpi Exp $ +** $Id: decoder.h,v 1.2 2003/10/03 22:22:27 alex Exp $ **/ #ifndef __DECODER_H__ @@ -57,12 +57,6 @@ extern "C" { #define FAAD_FMT_32BIT 3 #define FAAD_FMT_FLOAT 4 #define FAAD_FMT_DOUBLE 5 -#define FAAD_FMT_16BIT_DITHER 6 -#define FAAD_FMT_16BIT_L_SHAPE 7 -#define FAAD_FMT_16BIT_M_SHAPE 8 -#define FAAD_FMT_16BIT_H_SHAPE 9 - -#define FAAD_FMT_DITHER_LOWEST FAAD_FMT_16BIT_DITHER #define LC_DEC_CAP (1<<0) #define MAIN_DEC_CAP (1<<1) @@ -84,9 +78,9 @@ extern "C" { int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode); -uint32_t FAADAPI faacDecGetCapabilities(); +uint32_t FAADAPI faacDecGetCapabilities(void); -faacDecHandle FAADAPI faacDecOpen(); +faacDecHandle FAADAPI faacDecOpen(void); faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder); @@ -118,16 +112,6 @@ void* FAADAPI faacDecDecode(faacDecHandle hDecoder, uint8_t *buffer, uint32_t buffer_size); -element *decode_sce_lfe(faacDecHandle hDecoder, - faacDecFrameInfo *hInfo, bitfile *ld, - real_t **spec_coef, uint8_t id_syn_ele); -element *decode_cpe(faacDecHandle hDecoder, - faacDecFrameInfo *hInfo, bitfile *ld, - real_t **spec_coef, uint8_t id_syn_ele); -element **raw_data_block(faacDecHandle hDecoder, faacDecFrameInfo *hInfo, - bitfile *ld, element **elements, - real_t **spec_coef, program_config *pce, drc_info *drc); - #ifdef _WIN32 #pragma pack(pop) #endif |