Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'
authorJames Almer <jamrial@gmail.com>
Tue, 24 Oct 2017 22:26:29 +0000 (19:26 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 24 Oct 2017 22:26:29 +0000 (19:26 -0300)
* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b':
  hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/hevc_mvs.c

@@@ -482,10 -550,10 +482,10 @@@ void ff_hevc_luma_mv_merge_mode(HEVCCon
  {
      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;
 +    HEVCLocalContext *lc = s->HEVClc;
  
      if (s->ps.pps->log2_parallel_merge_level > 2 && nCS == 8) {
          singleMCLFlag = 1;