diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-29 20:33:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-29 21:02:15 +0200 |
| commit | 46807921f768477c9339ad92a785cc64d9407d20 (patch) | |
| tree | b647083fa0d11fd6c80de3cf1c273967ae18c5a3 /libavcodec/hevc_mvs.c | |
| parent | 77ab7407c2728de7517be81311bf84426b898685 (diff) | |
| parent | e3a00acde05c925617dc19b5373969d864bf8414 (diff) | |
| download | ffmpeg-46807921f768477c9339ad92a785cc64d9407d20.tar.gz | |
Merge commit 'e3a00acde05c925617dc19b5373969d864bf8414'
* commit 'e3a00acde05c925617dc19b5373969d864bf8414':
hevc: Initialize mergecand_list to 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 3bc982b8ad..e2b592c872 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -488,6 +488,8 @@ void ff_hevc_luma_mv_merge_mode(HEVCContext *s, int x0, int y0, int nPbW, int nPbH2 = nPbH; 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; |