[FFmpeg-cvslog] Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 24 19:26:29 2017 -0300| [953d55f4439ba3a302f9dcc83f8fe9577c22b804] | committer: James Almer

Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'

* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b':
  hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=953d55f4439ba3a302f9dcc83f8fe9577c22b804
---

 libavcodec/hevc_mvs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;


======================================================================

diff --cc libavcodec/hevc_mvs.c
index a8f7876b59,27df7c1527..fd0dbd9a56
--- a/libavcodec/hevc_mvs.c
+++ b/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;