diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-09-27 01:44:21 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-10-21 22:19:50 +0100 |
| commit | 4dee92f6bc8b89e9c335ab737412bf18f3a99be3 (patch) | |
| tree | 97cfab6b0b36802c24cd8d387bbe9bd720f3e722 | |
| parent | 5ae972f63b7684950eec28c81cb180e05457f109 (diff) | |
| download | ffmpeg-4dee92f6bc8b89e9c335ab737412bf18f3a99be3.tar.gz | |
hevc: Fix aligned array declarations
(cherry picked from commit d41e10c1485ec34aa342f7bc2e5bf4f9b6e66414)
| -rw-r--r-- | libavcodec/hevcdec.h | 2 | ||||
| -rw-r--r-- | libavcodec/hevcdsp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 293beb7083..ada2903222 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -363,7 +363,7 @@ typedef struct HEVCLocalContext { DECLARE_ALIGNED(32, uint8_t, edge_emu_buffer)[(MAX_PB_SIZE + 7) * EDGE_EMU_BUFFER_STRIDE * 2]; /* The extended size between the new edge emu buffer is abused by SAO */ DECLARE_ALIGNED(32, uint8_t, edge_emu_buffer2)[(MAX_PB_SIZE + 7) * EDGE_EMU_BUFFER_STRIDE * 2]; - DECLARE_ALIGNED(32, int16_t, tmp [MAX_PB_SIZE * MAX_PB_SIZE]); + DECLARE_ALIGNED(32, int16_t, tmp)[MAX_PB_SIZE * MAX_PB_SIZE]; int ct_depth; CodingUnit cu; diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c index 76ae72b6d4..e432aa3cf9 100644 --- a/libavcodec/hevcdsp.c +++ b/libavcodec/hevcdsp.c @@ -91,7 +91,7 @@ static const int8_t transform[32][32] = { 90, -90, 88, -85, 82, -78, 73, -67, 61, -54, 46, -38, 31, -22, 13, -4 }, }; -DECLARE_ALIGNED(16, const int8_t, ff_hevc_epel_filters[7][4]) = { +DECLARE_ALIGNED(16, const int8_t, ff_hevc_epel_filters)[7][4] = { { -2, 58, 10, -2}, { -4, 54, 16, -2}, { -6, 46, 28, -4}, @@ -101,7 +101,7 @@ DECLARE_ALIGNED(16, const int8_t, ff_hevc_epel_filters[7][4]) = { { -2, 10, 58, -2}, }; -DECLARE_ALIGNED(16, const int8_t, ff_hevc_qpel_filters[3][16]) = { +DECLARE_ALIGNED(16, const int8_t, ff_hevc_qpel_filters)[3][16] = { { -1, 4,-10, 58, 17, -5, 1, 0, -1, 4,-10, 58, 17, -5, 1, 0}, { -1, 4,-11, 40, 40,-11, 4, -1, -1, 4,-11, 40, 40,-11, 4, -1}, { 0, 1, -5, 17, 58,-10, 4, -1, 0, 1, -5, 17, 58,-10, 4, -1} |