Change max function to MAX macro for clang/gcc compatibility.

Remove couple of unnecessary comments
This commit is contained in:
Miika Metsoila 2017-09-15 14:21:51 +03:00
parent 5f7c5443a3
commit 769b17768d
3 changed files with 1 additions and 3 deletions

View file

@ -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

View file

@ -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]);
}
/**

View file

@ -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++)