comparison vp3.c @ 10961:34a65026fa06 libavcodec

Move array specifiers outside DECLARE_ALIGNED() invocations
author mru
date Fri, 22 Jan 2010 03:25:11 +0000
parents 7c0cc00cabc8
children df07e602819f
comparison
equal deleted inserted replaced
10960:10759fd39860 10961:34a65026fa06
198 VLC mode_code_vlc; 198 VLC mode_code_vlc;
199 VLC motion_vector_vlc; 199 VLC motion_vector_vlc;
200 200
201 /* these arrays need to be on 16-byte boundaries since SSE2 operations 201 /* these arrays need to be on 16-byte boundaries since SSE2 operations
202 * index into them */ 202 * index into them */
203 DECLARE_ALIGNED_16(int16_t, qmat[3][2][3][64]); //<qmat[qpi][is_inter][plane] 203 DECLARE_ALIGNED_16(int16_t, qmat)[3][2][3][64]; //<qmat[qpi][is_inter][plane]
204 204
205 /* This table contains superblock_count * 16 entries. Each set of 16 205 /* This table contains superblock_count * 16 entries. Each set of 16
206 * numbers corresponds to the fragment indexes 0..15 of the superblock. 206 * numbers corresponds to the fragment indexes 0..15 of the superblock.
207 * An entry will be -1 to indicate that no entry corresponds to that 207 * An entry will be -1 to indicate that no entry corresponds to that
208 * index. */ 208 * index. */
236 int entries; 236 int entries;
237 int huff_code_size; 237 int huff_code_size;
238 uint16_t huffman_table[80][32][2]; 238 uint16_t huffman_table[80][32][2];
239 239
240 uint8_t filter_limit_values[64]; 240 uint8_t filter_limit_values[64];
241 DECLARE_ALIGNED_8(int, bounding_values_array[256+2]); 241 DECLARE_ALIGNED_8(int, bounding_values_array)[256+2];
242 } Vp3DecodeContext; 242 } Vp3DecodeContext;
243 243
244 /************************************************************************ 244 /************************************************************************
245 * VP3 specific functions 245 * VP3 specific functions
246 ************************************************************************/ 246 ************************************************************************/
1395 */ 1395 */
1396 static void render_slice(Vp3DecodeContext *s, int slice) 1396 static void render_slice(Vp3DecodeContext *s, int slice)
1397 { 1397 {
1398 int x; 1398 int x;
1399 int16_t *dequantizer; 1399 int16_t *dequantizer;
1400 DECLARE_ALIGNED_16(DCTELEM, block[64]); 1400 DECLARE_ALIGNED_16(DCTELEM, block)[64];
1401 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef; 1401 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef;
1402 int motion_halfpel_index; 1402 int motion_halfpel_index;
1403 uint8_t *motion_source; 1403 uint8_t *motion_source;
1404 int plane; 1404 int plane;
1405 int current_macroblock_entry = slice * s->macroblock_width * 6; 1405 int current_macroblock_entry = slice * s->macroblock_width * 6;