diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:22:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 13:23:42 +0100 |
| commit | ef4e54e0df444142b7c975340df7ac478a598d20 (patch) | |
| tree | 5b1da1fa822306a2398db2392bbd181b73b3933b /libavcodec | |
| parent | 94cf1ef008c251923ec96b71022f03133d4d9304 (diff) | |
| parent | 28d82b7675bea76a1349070a3cdd737d964d4775 (diff) | |
Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'
* commit '28d82b7675bea76a1349070a3cdd737d964d4775':
vc1dec: refactor check with missing parenthesis
Conflicts:
libavcodec/vc1_mc.c
tests/ref/fate/vc1_ilaced_twomv
Theres no change to the reference checksums as this bug was not
in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1_mc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c index 3379932f6e..09e8facfea 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -802,11 +802,9 @@ void ff_vc1_interp_mc(VC1Context *v) my = s->mv[1][0][1]; uvmx = (mx + ((mx & 3) == 3)) >> 1; uvmy = (my + ((my & 3) == 3)) >> 1; - if (v->field_mode) { - if (v->cur_field_type != v->ref_field_type[1]) { - my = my - 2 + 4 * v->cur_field_type; - uvmy = uvmy - 2 + 4 * v->cur_field_type; - } + if (v->field_mode && v->cur_field_type != v->ref_field_type[1]) { + my = my - 2 + 4 * v->cur_field_type; + uvmy = uvmy - 2 + 4 * v->cur_field_type; } if (v->fastuvmc) { uvmx = uvmx + ((uvmx < 0) ? -(uvmx & 1) : (uvmx & 1)); |