Merge commit '26d9b603'

* commit '26d9b603':
  hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment
Merged-by: James Almer <jamrial@gmail.com>

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;