hevc: Initialize mergecand_list to 0

Message ID 20140929113425.612375DE4F@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Sept. 29, 2014, 11:34 a.m.
Module: libav
Branch: master
Commit: e3a00acde05c925617dc19b5373969d864bf8414

Author:    Luca Barbato <lu_zero@gentoo.org>
Committer: Vittorio Giovara <vittorio.giovara@gmail.com>
Date:      Wed Sep 17 19:51:40 2014 +0200

hevc: Initialize mergecand_list to 0

Unbreak cf6090dc6252f2b276aa4133e3d73a89f4c6046c.

CC: libav-stable@libav.org
Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1

---

 libavcodec/hevc_mvs.c |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c
index cc5a16c..a611b76 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;