Mercurial > libavcodec.hg
comparison dv.c @ 10961:34a65026fa06 libavcodec
Move array specifiers outside DECLARE_ALIGNED() invocations
author | mru |
---|---|
date | Fri, 22 Jan 2010 03:25:11 +0000 |
parents | d1ddb9a28c47 |
children | d464f498e19f |
comparison
equal
deleted
inserted
replaced
10960:10759fd39860 | 10961:34a65026fa06 |
---|---|
530 uint8_t *y_ptr; | 530 uint8_t *y_ptr; |
531 const uint8_t *buf_ptr; | 531 const uint8_t *buf_ptr; |
532 PutBitContext pb, vs_pb; | 532 PutBitContext pb, vs_pb; |
533 GetBitContext gb; | 533 GetBitContext gb; |
534 BlockInfo mb_data[5 * DV_MAX_BPM], *mb, *mb1; | 534 BlockInfo mb_data[5 * DV_MAX_BPM], *mb, *mb1; |
535 DECLARE_ALIGNED_16(DCTELEM, sblock[5*DV_MAX_BPM][64]); | 535 DECLARE_ALIGNED_16(DCTELEM, sblock)[5*DV_MAX_BPM][64]; |
536 DECLARE_ALIGNED_16(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */ | 536 DECLARE_ALIGNED_16(uint8_t, mb_bit_buffer)[80 + 4]; /* allow some slack */ |
537 DECLARE_ALIGNED_16(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */ | 537 DECLARE_ALIGNED_16(uint8_t, vs_bit_buffer)[5 * 80 + 4]; /* allow some slack */ |
538 const int log2_blocksize = 3-s->avctx->lowres; | 538 const int log2_blocksize = 3-s->avctx->lowres; |
539 int is_field_mode[5]; | 539 int is_field_mode[5]; |
540 | 540 |
541 assert((((int)mb_bit_buffer) & 7) == 0); | 541 assert((((int)mb_bit_buffer) & 7) == 0); |
542 assert((((int)vs_bit_buffer) & 7) == 0); | 542 assert((((int)vs_bit_buffer) & 7) == 0); |
831 | 831 |
832 static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, int linesize, DVVideoContext *s, int bias) | 832 static av_always_inline int dv_init_enc_block(EncBlockInfo* bi, uint8_t *data, int linesize, DVVideoContext *s, int bias) |
833 { | 833 { |
834 const int *weight; | 834 const int *weight; |
835 const uint8_t* zigzag_scan; | 835 const uint8_t* zigzag_scan; |
836 DECLARE_ALIGNED_16(DCTELEM, blk[64]); | 836 DECLARE_ALIGNED_16(DCTELEM, blk)[64]; |
837 int i, area; | 837 int i, area; |
838 /* We offer two different methods for class number assignment: the | 838 /* We offer two different methods for class number assignment: the |
839 method suggested in SMPTE 314M Table 22, and an improved | 839 method suggested in SMPTE 314M Table 22, and an improved |
840 method. The SMPTE method is very conservative; it assigns class | 840 method. The SMPTE method is very conservative; it assigns class |
841 3 (i.e. severe quantization) to any block where the largest AC | 841 3 (i.e. severe quantization) to any block where the largest AC |