Merge commit 'e3a00acde05c925617dc19b5373969d864bf8414'

* commit 'e3a00acde05c925617dc19b5373969d864bf8414':
  hevc: Initialize mergecand_list to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/hevc_mvs.c
index 3bc982b,a611b76..e2b592c
--- 1/libavcodec/hevc_mvs.c
--- 2/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@@ -486,8 -554,10 +486,10 @@@ void ff_hevc_luma_mv_merge_mode(HEVCCon
      LOCAL_ALIGNED(4, MvField, mergecand_list, [MRG_MAX_NUM_CANDS]);
      int nPbW2 = nPbW;
      int nPbH2 = nPbH;
 -    HEVCLocalContext *lc = &s->HEVClc;
 +    HEVCLocalContext *lc = s->HEVClc;
  
+     memset(mergecand_list, 0, MRG_MAX_NUM_CANDS * sizeof(*mergecand_list));
+ 
      if (s->pps->log2_parallel_merge_level > 2 && nCS == 8) {
          singleMCLFlag = 1;
          x0            = lc->cu.x;