From 20e7c8ae0a7f06c9d525a61ef1b7ac39756b1a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Wed, 26 Aug 2009 12:12:40 +0000
Subject: [PATCH] Remove some unnecessary alignment specifiers

None of these arrays are used in ways requiring extra alignment.

Originally committed as revision 19715 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/asv1.c      | 4 ++--
 libavcodec/dnxhddec.c  | 2 +-
 libavcodec/dv.c        | 4 ++--
 libavcodec/mpegaudio.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 10fbac24bc..c9a3d24944 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -49,8 +49,8 @@ typedef struct ASV1Context{
     int mb_width2;
     int mb_height2;
     DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
-    DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
-    DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
+    uint16_t intra_matrix[64];
+    int q_intra_matrix[64];
     uint8_t *bitstream_buffer;
     unsigned int bitstream_buffer_size;
 } ASV1Context;
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index ed349d2b64..25ccd13b10 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -40,7 +40,7 @@ typedef struct {
     int last_dc[3];
     DSPContext dsp;
     DECLARE_ALIGNED_16(DCTELEM, blocks[8][64]);
-    DECLARE_ALIGNED_8(ScanTable, scantable);
+    ScanTable scantable;
     const CIDEntry *cid_table;
 } DNXHDContext;
 
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 96d8c39489..95b2b798dc 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -527,8 +527,8 @@ static int dv_decode_video_segment(AVCodecContext *avctx, void *arg)
     GetBitContext gb;
     BlockInfo mb_data[5 * DV_MAX_BPM], *mb, *mb1;
     DECLARE_ALIGNED_16(DCTELEM, sblock[5*DV_MAX_BPM][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 */
+    uint8_t mb_bit_buffer[80 + 4]; /* allow some slack */
+    uint8_t vs_bit_buffer[5 * 80 + 4]; /* allow some slack */
     const int log2_blocksize = 3-s->avctx->lowres;
     int is_field_mode[5];
 
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 65a2283fba..cd10dbcfc0 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -108,7 +108,7 @@ typedef struct MPADecodeHeader {
 
 typedef struct MPADecodeContext {
     MPA_DECODE_HEADER
-    DECLARE_ALIGNED_8(uint8_t, last_buf[2*BACKSTEP_SIZE + EXTRABYTES]);
+    uint8_t last_buf[2*BACKSTEP_SIZE + EXTRABYTES];
     int last_buf_size;
     /* next header (used in free format parsing) */
     uint32_t free_format_next_header;