[FFmpeg-cvslog] libavcodec/wmv2: remove dead code
Michael Niedermayer
git at videolan.org
Fri Jun 13 04:31:05 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 13 04:21:52 2014 +0200| [cf9050c715b45b0f0582687554cca3bf680124b3] | committer: Michael Niedermayer
libavcodec/wmv2: remove dead code
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf9050c715b45b0f0582687554cca3bf680124b3
---
libavcodec/wmv2.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
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;
More information about the ffmpeg-cvslog
mailing list