diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-01-22 03:25:11 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-01-22 03:25:11 +0000 |
| commit | c67278098def4438fc587744f5df1c147bc95dc3 (patch) | |
| tree | 032a9f82fd504566b8e7361d6ea6e80cbda18c0c /libavcodec/h264.h | |
| parent | 27ce1be89ba765d4129a638f2dd673e1f6e17682 (diff) | |
| download | ffmpeg-c67278098def4438fc587744f5df1c147bc95dc3.tar.gz | |
Move array specifiers outside DECLARE_ALIGNED() invocations
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f342729fa5..d15d43aed1 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -299,7 +299,7 @@ typedef struct H264Context{ * non zero coeff count cache. * is 64 if not available. */ - DECLARE_ALIGNED_8(uint8_t, non_zero_count_cache[6*8]); + DECLARE_ALIGNED_8(uint8_t, non_zero_count_cache)[6*8]; /* .UU.YYYY @@ -312,8 +312,8 @@ typedef struct H264Context{ /** * Motion vector cache. */ - DECLARE_ALIGNED_8(int16_t, mv_cache[2][5*8][2]); - DECLARE_ALIGNED_8(int8_t, ref_cache[2][5*8]); + DECLARE_ALIGNED_8(int16_t, mv_cache)[2][5*8][2]; + DECLARE_ALIGNED_8(int8_t, ref_cache)[2][5*8]; #define LIST_NOT_USED -1 //FIXME rename? #define PART_NOT_AVAILABLE -2 @@ -377,7 +377,7 @@ typedef struct H264Context{ int mb_field_decoding_flag; int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag - DECLARE_ALIGNED_8(uint16_t, sub_mb_type[4]); + DECLARE_ALIGNED_8(uint16_t, sub_mb_type)[4]; //POC stuff int poc_lsb; @@ -456,7 +456,7 @@ typedef struct H264Context{ GetBitContext *intra_gb_ptr; GetBitContext *inter_gb_ptr; - DECLARE_ALIGNED_16(DCTELEM, mb[16*24]); + DECLARE_ALIGNED_16(DCTELEM, mb)[16*24]; DCTELEM mb_padding[256]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb /** @@ -475,7 +475,7 @@ typedef struct H264Context{ uint8_t *chroma_pred_mode_table; int last_qscale_diff; int16_t (*mvd_table[2])[2]; - DECLARE_ALIGNED_8(int16_t, mvd_cache[2][5*8][2]); + DECLARE_ALIGNED_8(int16_t, mvd_cache)[2][5*8][2]; uint8_t *direct_table; uint8_t direct_cache[5*8]; |