diff options
| author | gcocherel <gildas.cocherel@laposte.net> | 2013-10-15 16:47:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 00:17:28 +0200 |
| commit | cf49d0156dfdfbabf3077ddc97eeb0737837d969 (patch) | |
| tree | 02fbeebde2bcb3cbb0982f0bf15cbf00812a33bc /libavcodec/hevc_mvs.c | |
| parent | 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0 (diff) | |
| download | ffmpeg-cf49d0156dfdfbabf3077ddc97eeb0737837d969.tar.gz | |
valgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index f23a0d9e12..701510903b 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -854,9 +854,7 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW, xA0_pu = xA0 >> s->sps->log2_min_pu_size; yA0_pu = yA0 >> s->sps->log2_min_pu_size; - is_available_a0 = AVAILABLE(cand_bottom_left, A0); - if (is_available_a0) - is_available_a0 = PRED_BLOCK_AVAILABLE(A0); + is_available_a0 = PRED_BLOCK_AVAILABLE(A0) && AVAILABLE(cand_bottom_left, A0); //left spatial merge candidate xA1 = x0 - 1; @@ -900,9 +898,7 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW, xB0_pu = xB0 >> s->sps->log2_min_pu_size; yB0_pu = yB0 >> s->sps->log2_min_pu_size; - is_available_b0 = AVAILABLE(cand_up_right, B0); - if (is_available_b0) - is_available_b0 = PRED_BLOCK_AVAILABLE(B0); + is_available_b0 = PRED_BLOCK_AVAILABLE(B0) && AVAILABLE(cand_up_right, B0); if (is_available_b0) { availableFlagLXB0 = MP_MX(B0, pred_flag_index_l0, mxB); |