summaryrefslogtreecommitdiff
path: root/libavcodec/wma.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-06 14:24:59 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-06 14:24:59 +0000
commit84dc2d8afa1fce31c6fe97149ef70ba966500f65 (patch)
tree650f8234ea81d9b0ec75ebf125e4d71c066a1337 /libavcodec/wma.h
parentda033b05ab2f3c9dd0274243df88bd8363de6c24 (diff)
downloadffmpeg-84dc2d8afa1fce31c6fe97149ef70ba966500f65.tar.gz
Remove DECLARE_ALIGNED_{8,16} macros
These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wma.h')
-rw-r--r--libavcodec/wma.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index df992c0add..00d99eff19 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -111,15 +111,15 @@ typedef struct WMACodecContext {
uint8_t ms_stereo; ///< true if mid/side stereo mode
uint8_t channel_coded[MAX_CHANNELS]; ///< true if channel is coded
int exponents_bsize[MAX_CHANNELS]; ///< log2 ratio frame/exp. length
- DECLARE_ALIGNED_16(float, exponents)[MAX_CHANNELS][BLOCK_MAX_SIZE];
+ DECLARE_ALIGNED(16, float, exponents)[MAX_CHANNELS][BLOCK_MAX_SIZE];
float max_exponent[MAX_CHANNELS];
WMACoef coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE];
- DECLARE_ALIGNED_16(float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE];
- DECLARE_ALIGNED_16(FFTSample, output)[BLOCK_MAX_SIZE * 2];
+ DECLARE_ALIGNED(16, float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE];
+ DECLARE_ALIGNED(16, FFTSample, output)[BLOCK_MAX_SIZE * 2];
FFTContext mdct_ctx[BLOCK_NB_SIZES];
float *windows[BLOCK_NB_SIZES];
/* output buffer for one frame and the last for IMDCT windowing */
- DECLARE_ALIGNED_16(float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2];
+ DECLARE_ALIGNED(16, float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2];
/* last frame info */
uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + 4]; /* padding added */
int last_bitoffset;