Merge commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 21:20:50 +0000 (23:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 21:20:50 +0000 (23:20 +0200)
* commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c':
  hevc: Initialize mergecand_list to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
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;