Commit 46807921 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e3a00acd'

* commit 'e3a00acd':
  hevc: Initialize mergecand_list to 0
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 77ab7407 e3a00acd
...@@ -488,6 +488,8 @@ void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0, int nPbW, ...@@ -488,6 +488,8 @@ void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0, int nPbW,
int nPbH2 = nPbH; 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) { if (s->pps->log2_parallel_merge_level > 2 && nCS == 8) {
singleMCLFlag = 1; singleMCLFlag = 1;
x0 = lc->cu.x; x0 = lc->cu.x;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment