diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 2295ed24ced4d3f20df3162538f01c82b4d94626..7ac72a5e701cebf9e4406ce9d1620916adb6d213 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -136,21 +136,13 @@ void ff_mspel_motion(MpegEncContext *s, if(s->flags&CODEC_FLAG_GRAY) return; - if (s->out_format == FMT_H263) { - dxy = 0; - if ((motion_x & 3) != 0) - dxy |= 1; - if ((motion_y & 3) != 0) - dxy |= 2; - mx = motion_x >> 2; - my = motion_y >> 2; - } else { - mx = motion_x / 2; - my = motion_y / 2; - dxy = ((my & 1) << 1) | (mx & 1); - mx >>= 1; - my >>= 1; - } + dxy = 0; + if ((motion_x & 3) != 0) + dxy |= 1; + if ((motion_y & 3) != 0) + dxy |= 2; + mx = motion_x >> 2; + my = motion_y >> 2; src_x = s->mb_x * 8 + mx; src_y = s->mb_y * 8 + my;