avcodec/vvcdec: check_available, use && instead of &= for shortcut evaluation

Nuo Mi committed 2 years ago

Commit 3e497241 parent 4f882c41 file · +2 −2Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/vvc/mvs.c+2−2

@@ -614,9 +614,9 @@ static int check_available(Neighbour n, const VVCLocalContext lc, const int ch · 613 unmodified lines
614	if (!n->checked) {	614	if (!n->checked) {
615	n->checked = 1;	615	n->checked = 1;
616	n->available = !sps->r->sps_entropy_coding_sync_enabled_flag \|\| ((n->x >> sps->ctb_log2_size_y) <= (cu->x0 >> sps->ctb_log2_size_y));	616	n->available = !sps->r->sps_entropy_coding_sync_enabled_flag \|\| ((n->x >> sps->ctb_log2_size_y) <= (cu->x0 >> sps->ctb_log2_size_y));
617	n->available &= is_available(fc, n->x, n->y) && cu->pred_mode == pred_flag_to_mode(TAB_MVF(n->x, n->y).pred_flag);	617	n->available = n->available && is_available(fc, n->x, n->y) && cu->pred_mode == pred_flag_to_mode(TAB_MVF(n->x, n->y).pred_flag);
618	if (check_mer)	618	if (check_mer)
619	n->available &= !is_same_mer(fc, n->x, n->y, cu->x0, cu->y0);	619	n->available = n->available && !is_same_mer(fc, n->x, n->y, cu->x0, cu->y0);
620	}	620	}
621	return n->available;	621	return n->available;
622	}	622	}