diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-13 04:21:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-13 04:26:19 +0200 |
| commit | cf9050c715b45b0f0582687554cca3bf680124b3 (patch) | |
| tree | 77fef3cb07646e66696d8c372eca4b6d97709f43 /libavcodec/wmv2.c | |
| parent | 1c5aa64a5927573a875934404d15f76e968f1e8d (diff) | |
| download | ffmpeg-cf9050c715b45b0f0582687554cca3bf680124b3.tar.gz | |
libavcodec/wmv2: remove dead code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
| -rw-r--r-- | libavcodec/wmv2.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 2295ed24ce..7ac72a5e70 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; |