har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc1dec: move an if() block.

Browse Source 
There are no reason for "if (c_valid) { ... }" to appear before
"if (b_valid) { ... }".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
shahriman AMS 2011-11-08 08:47:33 +00:00 committed by Anton Khirnov
parent 4bceeaf0c1
commit 62622d04eb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/vc1dec.c
View File

@ -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; field_predA[0] = field_predA[1] = 0;
a_f = 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) { if (b_valid) {
b_f = v->mv_f[dir][xy - wrap + off + v->blocks_off]; b_f = v->mv_f[dir][xy - wrap + off + v->blocks_off];
num_oppfield += b_f; 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; field_predB[0] = field_predB[1] = 0;
b_f = 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 (v->field_mode) {
if (num_samefield <= num_oppfield) if (num_samefield <= num_oppfield)