diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-06-03 12:36:52 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2006-06-03 12:36:52 +0000 |
| commit | 77da940a799f99060d306ea3b9d65d287d8c0824 (patch) | |
| tree | 805d8b2fedcb9fda77c02cf8b9b7d59db251ab90 /src | |
| parent | 70c37330ee2cea62a681526ff857d9677f1beca9 (diff) | |
| download | xine-lib-77da940a799f99060d306ea3b9d65d287d8c0824.tar.gz xine-lib-77da940a799f99060d306ea3b9d65d287d8c0824.tar.bz2 | |
Use the actually-implemented interface instead of the out-of-date faad.h.
This fixes various problems on 64-bit systems to do with the different size
of long ints and pointer types.
If this is not already upstream, it should be pushed upstream.
(Patch from Gentoo.)
CVS patchset: 8012
CVS date: 2006/06/03 12:36:52
Diffstat (limited to 'src')
| -rw-r--r-- | src/libfaad/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libfaad/xine_decoder.c | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index d8cc1c36b..a03f780be 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -66,7 +66,6 @@ noinst_HEADERS = \ drc.h \ drm_dec.h \ error.h \ - faad.h \ filtbank.h \ fixed.h \ huffman.h \ diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c index 5c07e9aeb..da4b13cce 100644 --- a/src/libfaad/xine_decoder.c +++ b/src/libfaad/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.46 2006/06/02 22:18:57 dsalt Exp $ + * $Id: xine_decoder.c,v 1.47 2006/06/03 12:36:52 dsalt Exp $ * */ @@ -38,7 +38,12 @@ #include "audio_out.h" #include "buffer.h" #include "xineutils.h" -#include "faad.h" +#include "common.h" +#include "structs.h" +#include "decoder.h" +#include "syntax.h" + +#define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */ typedef struct { audio_decoder_class_t decoder_class; @@ -50,9 +55,9 @@ typedef struct faad_decoder_s { xine_stream_t *stream; /* faad2 stuff */ - faacDecHandle faac_dec; - faacDecConfigurationPtr faac_cfg; - faacDecFrameInfo faac_finfo; + NeAACDecHandle faac_dec; + NeAACDecConfigurationPtr faac_cfg; + NeAACDecFrameInfo faac_finfo; int faac_failed; int raw_mode; @@ -66,7 +71,7 @@ typedef struct faad_decoder_s { unsigned char *dec_config; int dec_config_size; - unsigned long rate; + uint32_t rate; int bits_per_sample; unsigned char num_channels; int sbr; |