From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/ac3dec.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ffmpeg/libavcodec/ac3dec.h') diff --git a/ffmpeg/libavcodec/ac3dec.h b/ffmpeg/libavcodec/ac3dec.h index 6c99ef6..fa447c4 100644 --- a/ffmpeg/libavcodec/ac3dec.h +++ b/ffmpeg/libavcodec/ac3dec.h @@ -81,7 +81,6 @@ typedef struct AC3DecodeContext { int num_blocks; ///< number of audio blocks int bitstream_mode; ///< bitstream mode (bsmod) int channel_mode; ///< channel mode (acmod) - int channel_layout; ///< channel layout int lfe_on; ///< lfe channel in use int channel_map; ///< custom channel map int center_mix_level; ///< Center mix level index @@ -209,7 +208,7 @@ typedef struct AC3DecodeContext { float *dlyptr[AC3_MAX_CHANNELS]; ///@name Aligned arrays - DECLARE_ALIGNED(16, int, fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< fixed-point transform coefficients + DECLARE_ALIGNED(16, int32_t, fixed_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< fixed-point transform coefficients DECLARE_ALIGNED(32, float, transform_coeffs)[AC3_MAX_CHANNELS][AC3_MAX_COEFS]; ///< transform coefficients DECLARE_ALIGNED(32, float, delay)[AC3_MAX_CHANNELS][AC3_BLOCK_SIZE]; ///< delay - added to the next block DECLARE_ALIGNED(32, float, window)[AC3_BLOCK_SIZE]; ///< window coefficients -- cgit v1.2.3