Added missing (0,0) merge/skip candidate to search

This commit is contained in:
Marko Viitanen 2013-11-05 12:49:39 +02:00
parent 93f2b75df7
commit 2c61286326

View file

@ -417,14 +417,13 @@ uint8_t inter_get_merge_cand(encoder_control *encoder, int32_t x_cu, int32_t y_c
}
#endif
// Fill with (0,0)
/*
while (candidates < MRG_MAX_NUM_CANDS) {
// Add (0,0) prediction
if (candidates != 5) {
mv_cand[candidates][0] = 0;
mv_cand[candidates][1] = 0;
candidates++;
}
*/
return candidates;
}