Use sign_extend function instead of reimplementing it.

Originally committed as revision 18599 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Reimar Döffinger 16 years ago
parent e62f622193
commit d7670f2827
  1. 10
      libavcodec/xan.c

@ -333,16 +333,10 @@ static void xan_wc3_decode_frame(XanContext *s) {
} }
} else { } else {
/* run-based motion compensation from last frame */ /* run-based motion compensation from last frame */
motion_x = *vector_segment >> 4; motion_x = sign_extend(*vector_segment >> 4, 4);
motion_y = *vector_segment & 0xF; motion_y = sign_extend(*vector_segment & 0xF, 4);
vector_segment++; vector_segment++;
/* sign extension */
if (motion_x & 0x8)
motion_x |= 0xFFFFFFF0;
if (motion_y & 0x8)
motion_y |= 0xFFFFFFF0;
/* copy a run of pixels from the previous frame */ /* copy a run of pixels from the previous frame */
xan_wc3_copy_pixel_run(s, x, y, size, motion_x, motion_y); xan_wc3_copy_pixel_run(s, x, y, size, motion_x, motion_y);

Loading…
Cancel
Save