From 8e5f465f4c5e5750058da3b65a61e77db08b4d1c Mon Sep 17 00:00:00 2001
From: Alexander Strange <astrange@ithinksw.com>
Date: Tue, 8 Apr 2008 01:09:33 +0000
Subject: [PATCH] Increase alignment for DCT block arrays from 8 to 16

Patch by Alexander Strange ( astrange ithinksw com )

Originally committed as revision 12767 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/asv1.c     | 2 +-
 libavcodec/dv.c       | 2 +-
 libavcodec/mdec.c     | 2 +-
 libavcodec/mjpegdec.h | 2 +-
 libavcodec/wmv2.h     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index f7d3f4c462..ba8ca16ab9 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -47,7 +47,7 @@ typedef struct ASV1Context{
     int mb_height;
     int mb_width2;
     int mb_height2;
-    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
     DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
     DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
     uint8_t *bitstream_buffer;
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 3a8a843464..3983381640 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -376,7 +376,7 @@ static inline void dv_decode_video_segment(DVVideoContext *s,
     PutBitContext pb, vs_pb;
     GetBitContext gb;
     BlockInfo mb_data[5 * 6], *mb, *mb1;
-    DECLARE_ALIGNED_8(DCTELEM, sblock[5*6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, sblock[5*6][64]);
     DECLARE_ALIGNED_8(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */
     DECLARE_ALIGNED_8(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */
     const int log2_blocksize= 3-s->avctx->lowres;
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 5c1382e3c0..356e0316b3 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -47,7 +47,7 @@ typedef struct MDECContext{
     int mb_width;
     int mb_height;
     int mb_x, mb_y;
-    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
     DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
     DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
     uint8_t *bitstream_buffer;
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index 6c1e40f22e..d6022eb1e9 100644
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -82,7 +82,7 @@ typedef struct MJpegDecodeContext {
     AVFrame picture; /* picture structure */
     int linesize[MAX_COMPONENTS];                   ///< linesize << interlaced
     int8_t *qscale_table;
-    DECLARE_ALIGNED_8(DCTELEM, block[64]);
+    DECLARE_ALIGNED_16(DCTELEM, block[64]);
     ScanTable scantable;
     DSPContext dsp;
 
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 2fd842e6a2..9d43ec547e 100644
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -50,7 +50,7 @@ typedef struct Wmv2Context{
     int hshift;
 
     ScanTable abt_scantable[2];
-    DECLARE_ALIGNED_8(DCTELEM, abt_block2[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, abt_block2[6][64]);
 }Wmv2Context;
 
 void ff_wmv2_common_init(Wmv2Context * w);