Commit 62622d04 authored by shahriman AMS's avatar shahriman AMS Committed by Anton Khirnov

vc1dec: move an if() block.

There are no reason for "if (c_valid) { ... }" to appear before
"if (b_valid) { ... }".
Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 4bceeaf0
......@@ -1561,16 +1561,6 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y,
field_predA[0] = field_predA[1] = 0;
a_f = 0;
}
if (c_valid) {
c_f = v->mv_f[dir][xy - 1 + v->blocks_off];
num_oppfield += c_f;
num_samefield += 1 - c_f;
field_predC[0] = C[0];
field_predC[1] = C[1];
} else {
field_predC[0] = field_predC[1] = 0;
c_f = 0;
}
if (b_valid) {
b_f = v->mv_f[dir][xy - wrap + off + v->blocks_off];
num_oppfield += b_f;
......@@ -1581,6 +1571,16 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y,
field_predB[0] = field_predB[1] = 0;
b_f = 0;
}
if (c_valid) {
c_f = v->mv_f[dir][xy - 1 + v->blocks_off];
num_oppfield += c_f;
num_samefield += 1 - c_f;
field_predC[0] = C[0];
field_predC[1] = C[1];
} else {
field_predC[0] = field_predC[1] = 0;
c_f = 0;
}
if (v->field_mode) {
if (num_samefield <= num_oppfield)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment