aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-09-17 19:51:40 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-09-29 12:33:46 +0100
commite3a00acde05c925617dc19b5373969d864bf8414 (patch)
treed0a066f2c01d12c4be078933be7ee6a197206d88
parenta05f5052fef3b3743fab7846da12861d8a8098ec (diff)
downloadffmpeg-e3a00acde05c925617dc19b5373969d864bf8414.tar.gz
hevc: Initialize mergecand_list to 0
Unbreak cf6090dc6252f2b276aa4133e3d73a89f4c6046c. CC: libav-stable@libav.org Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1
-rw-r--r--libavcodec/hevc_mvs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index cc5a16ce72..a611b762f1 100644
--- a/libavcodec/hevc_mvs.c
+++ b/libavcodec/hevc_mvs.c
@@ -556,6 +556,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;