From cd714afe81363ca773b185414db71a6e02fa5dde Mon Sep 17 00:00:00 2001 From: Mickaël Raulet Date: Sat, 19 Jul 2014 01:38:06 +0200 Subject: hevc/mvs: more cleanups cherry picked from commit c4e467e79f59453783c97bc6044082edb7a6468b Signed-off-by: Michael Niedermayer --- libavcodec/hevc_mvs.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libavcodec/hevc_mvs.c') diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 47cac572e8..5c777df795 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -52,8 +52,7 @@ void ff_hevc_set_neighbour_available(HEVCContext *s, int x0, int y0, ((x0b + nPbW) == (1 << s->sps->log2_ctb_size)) ? lc->ctb_up_right_flag && !y0b : lc->na.cand_up; lc->na.cand_up_right = - ((x0b + nPbW) == (1 << s->sps->log2_ctb_size) ? - lc->ctb_up_right_flag && !y0b : lc->na.cand_up ) + lc->na.cand_up_right_sap && (x0 + nPbW) < lc->end_of_tiles_x; lc->na.cand_bottom_left = ((y0 + nPbH) >= lc->end_of_tiles_y) ? 0 : lc->na.cand_left; } @@ -71,12 +70,6 @@ static int z_scan_block_avail(HEVCContext *s, int xCurr, int yCurr, int yCurr_ctb = yCurr >> s->sps->log2_ctb_size; int xN_ctb = xN >> s->sps->log2_ctb_size; int yN_ctb = yN >> s->sps->log2_ctb_size; - - if (xN < 0 || yN < 0 || - xN >= s->sps->width || - yN >= s->sps->height) - return 0; - if( yN_ctb < yCurr_ctb || xN_ctb < xCurr_ctb ) return 1; else { -- cgit v1.2.3