Merge commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62'

* commit 'a6ac4fcce44108f6f87278b8d12e890576f46a62': vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock

Michael Niedermayer committed 12 years ago

Commit 2adcd152 parents 4959a4f a6ac4fc1 file · +1 −1Browse files

Unified · Split

@@ -93,7 +93,7 @@ typedef struct VP8Macroblock { · 92 unmodified lines
93	uint8_t chroma_pred_mode;	93	uint8_t chroma_pred_mode;
94	uint8_t segment;	94	uint8_t segment;
95	uint8_t intra4x4_pred_mode_mb[16];	95	uint8_t intra4x4_pred_mode_mb[16];
96	uint8_t intra4x4_pred_mode_top[4];	96	DECLARE_ALIGNED(4, uint8_t, intra4x4_pred_mode_top)[4];
97	VP56mv mv;	97	VP56mv mv;
98	VP56mv bmv[16];	98	VP56mv bmv[16];
99	} VP8Macroblock;	99	} VP8Macroblock;

Keyboard shortcuts