diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-24 19:26:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-24 19:26:29 -0300 |
| commit | 953d55f4439ba3a302f9dcc83f8fe9577c22b804 (patch) | |
| tree | cde892ee613856d0083201f5adbffe8f355b9ae0 /libavcodec/hevc_mvs.c | |
| parent | d289f3febda26b59b0c66c581c5f88935f5c0bde (diff) | |
| parent | 26d9b60373bf45bc4f91ff6815f5fa36764d4d7b (diff) | |
Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'
* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b':
hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index a8f7876b59..fd0dbd9a56 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -482,7 +482,7 @@ void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0, int nPbW, { int singleMCLFlag = 0; int nCS = 1 << log2_cb_size; - LOCAL_ALIGNED(4, MvField, mergecand_list, [MRG_MAX_NUM_CANDS]); + MvField mergecand_list[MRG_MAX_NUM_CANDS]; int nPbW2 = nPbW; int nPbH2 = nPbH; HEVCLocalContext *lc = s->HEVClc; |