From cf9050c715b45b0f0582687554cca3bf680124b3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 13 Jun 2014 04:21:52 +0200 Subject: libavcodec/wmv2: remove dead code Signed-off-by: Michael Niedermayer --- libavcodec/wmv2.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'libavcodec/wmv2.c') diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 2295ed2..7ac72a5 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; -- cgit v1.1