diff --git a/src/inter.c b/src/inter.c index 0cd00683..ef050a7c 100644 --- a/src/inter.c +++ b/src/inter.c @@ -437,7 +437,7 @@ void inter_get_mv_cand(encoder_control *encoder, int32_t x, int32_t y, int8_t de * \param depth current block depth * \param mv_pred[MRG_MAX_NUM_CANDS][2] MRG_MAX_NUM_CANDS motion vector prediction */ -uint8_t inter_get_merge_cand(int32_t x, int32_t y, int8_t depth, int16_t mv_cand[MRG_MAX_NUM_CANDS][3], cu_info* cur_cu, lcu_t *lcu) +uint8_t inter_get_merge_cand(int32_t x, int32_t y, int8_t depth, int16_t mv_cand[MRG_MAX_NUM_CANDS][3], lcu_t *lcu) { uint8_t candidates = 0; int8_t duplicate = 0; diff --git a/src/inter.h b/src/inter.h index 46148312..60418252 100644 --- a/src/inter.h +++ b/src/inter.h @@ -36,5 +36,5 @@ void inter_recon_lcu(picture* ref,int32_t xpos, int32_t ypos,int32_t width, cons void inter_get_spatial_merge_candidates(int32_t x, int32_t y, int8_t depth, cu_info **b0, cu_info **b1, cu_info **b2,cu_info **a0,cu_info **a1, lcu_t *lcu); void inter_get_mv_cand(encoder_control *encoder, int32_t x, int32_t y, int8_t depth, int16_t mv_cand[2][2], cu_info* cur_cu, lcu_t *lcu); -uint8_t inter_get_merge_cand(int32_t x, int32_t y, int8_t depth, int16_t mv_cand[MRG_MAX_NUM_CANDS][3], cu_info* cur_cu, lcu_t *lcu); +uint8_t inter_get_merge_cand(int32_t x, int32_t y, int8_t depth, int16_t mv_cand[MRG_MAX_NUM_CANDS][3], lcu_t *lcu); #endif diff --git a/src/search.c b/src/search.c index 767e3002..9f2f1200 100644 --- a/src/search.c +++ b/src/search.c @@ -374,7 +374,7 @@ static int search_cu_inter(encoder_control *encoder, int x, int y, int depth, lc // Search for merge mode candidate int16_t merge_cand[MRG_MAX_NUM_CANDS][3]; // Get list of candidates - int16_t num_cand = inter_get_merge_cand(x, y, depth, merge_cand, cur_cu, lcu); + int16_t num_cand = inter_get_merge_cand(x, y, depth, merge_cand, lcu); // Select better candidate cur_cu->inter.mv_cand = 0; // Default to candidate 0