diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:20:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:20:50 +0200 |
| commit | 63660277fd402f6d874087dcef6a8dbaa43e8f7a (patch) | |
| tree | ee63eb75f4b0f75692650cf376f985067dffbb4b /libavcodec/hevc_mvs.c | |
| parent | 6101187c5501c302350d01f50d5aa7f76a6b4ce5 (diff) | |
| parent | 570cefb02b4f149c4263677e1a3eea216ee0ec8c (diff) | |
| download | ffmpeg-63660277fd402f6d874087dcef6a8dbaa43e8f7a.tar.gz | |
Merge commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c' into release/2.4
* commit '570cefb02b4f149c4263677e1a3eea216ee0ec8c':
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; |