Move array specifiers outside DECLARE_ALIGNED() invocations

[ffmpeg] / libavcodec / mlp.c

diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c
index 6f10c3535e9e99f2e628d974afd1a32299af7894..87f7c771395c35bc1f4bda3020841012a4e168a1 100644 (file)
--- a/libavcodec/mlp.c
+++ b/libavcodec/mlp.c
@@ -42,11 +42,16 @@ const uint8_t ff_mlp_huffman_tables[3][18][2] = {
 };
 
 static int crc_init = 0;
-static AVCRC crc_63[1024];
-static AVCRC crc_1D[1024];
-static AVCRC crc_2D[1024];
-
-void av_cold ff_mlp_init_crc()
+#if CONFIG_SMALL
+#define CRC_TABLE_SIZE 257
+#else
+#define CRC_TABLE_SIZE 1024
+#endif
+static AVCRC crc_63[CRC_TABLE_SIZE];
+static AVCRC crc_1D[CRC_TABLE_SIZE];
+static AVCRC crc_2D[CRC_TABLE_SIZE];
+
+av_cold void ff_mlp_init_crc(void)
 {
     if (!crc_init) {
         av_crc_init(crc_63, 0,  8,   0x63, sizeof(crc_63));
@@ -96,6 +101,8 @@ uint8_t ff_mlp_calculate_parity(const uint8_t *buf, unsigned int buf_size)
     uint32_t scratch = 0;
     const uint8_t *buf_end = buf + buf_size;
 
+    for (; ((intptr_t) buf & 3) && buf < buf_end; buf++)
+        scratch ^= *buf;
     for (; buf < buf_end - 3; buf += 4)
         scratch ^= *((const uint32_t*)buf);