diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-06 14:24:59 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-06 14:24:59 +0000 |
| commit | 84dc2d8afa1fce31c6fe97149ef70ba966500f65 (patch) | |
| tree | 650f8234ea81d9b0ec75ebf125e4d71c066a1337 /libavcodec/h264.h | |
| parent | da033b05ab2f3c9dd0274243df88bd8363de6c24 (diff) | |
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/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 0ca6ed15ad..cac32db828 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_16(int16_t, mv_cache)[2][5*8][2]; - DECLARE_ALIGNED_8(int8_t, ref_cache)[2][5*8]; + DECLARE_ALIGNED(16, 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 @@ -366,7 +366,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]; //Weighted pred stuff int use_weight; @@ -403,7 +403,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 /** @@ -421,7 +421,7 @@ typedef struct H264Context{ uint8_t *chroma_pred_mode_table; int last_qscale_diff; uint8_t (*mvd_table[2])[2]; - DECLARE_ALIGNED_16(uint8_t, mvd_cache)[2][5*8][2]; + DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5*8][2]; uint8_t *direct_table; uint8_t direct_cache[5*8]; |