From 769b17768de7d6367a0c3eb374b5a6fc5cd9dcb5 Mon Sep 17 00:00:00 2001 From: Miika Metsoila Date: Fri, 15 Sep 2017 14:21:51 +0300 Subject: [PATCH] Change max function to MAX macro for clang/gcc compatibility. Remove couple of unnecessary comments --- src/cu.h | 1 - src/encoderstate.c | 1 - src/search_inter.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cu.h b/src/cu.h index 530f2928..c2c29f13 100644 --- a/src/cu.h +++ b/src/cu.h @@ -143,7 +143,6 @@ typedef struct #endif } intra; struct { - //uint32_t poc[2]; int16_t mv[2][2]; // \brief Motion vectors for L0 and L1 uint8_t mv_ref[2]; // \brief Index of the L0 and L1 array. uint8_t mv_cand0 : 3; // \brief selected MV candidate diff --git a/src/encoderstate.c b/src/encoderstate.c index f7c06528..515f53e9 100644 --- a/src/encoderstate.c +++ b/src/encoderstate.c @@ -831,7 +831,6 @@ void kvz_encoder_create_ref_lists(const encoder_state_t *const state) } encoder_ref_insertion_sort(state, state->frame->ref_LX[0], state->frame->ref_LX_size[0]); - //encoder_ref_insertion_sort(state, state->frame->ref_LX[1], state->frame->ref_LX_size[1]); } /** diff --git a/src/search_inter.c b/src/search_inter.c index 6de7e202..437339d7 100644 --- a/src/search_inter.c +++ b/src/search_inter.c @@ -1249,7 +1249,7 @@ static void search_pu_inter_ref(encoder_state_t * const state, // the index of the ref_idx in L0 or L1 list int8_t LX_idx; // max value of LX_idx plus one - const int8_t LX_IDX_MAX_PLUS_1 = max(state->frame->ref_LX_size[0], + const int8_t LX_IDX_MAX_PLUS_1 = MAX(state->frame->ref_LX_size[0], state->frame->ref_LX_size[1]); for (LX_idx = 0; LX_idx < LX_IDX_MAX_PLUS_1; LX_idx++)