summaryrefslogtreecommitdiffstats
path: root/libavcodec/wmv2.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-09-27 20:13:59 -0400
committerMichael Niedermayer <michaelni@gmx.at>2013-09-28 11:28:09 +0200
commitc341f734e5f9d6af4a8fdcceb6f5d12de6395c76 (patch)
tree42c66699b2e6685e3c4ab67d32a6d0dec7a6e2be /libavcodec/wmv2.c
parent7381d31f2267489ed5e939707b7e77a20adc168d (diff)
downloadffmpeg-streaming-c341f734e5f9d6af4a8fdcceb6f5d12de6395c76.zip
ffmpeg-streaming-c341f734e5f9d6af4a8fdcceb6f5d12de6395c76.tar.gz
Convert multiplier for MV from int to ptrdiff_t.
This prevents emulated_edge_mc from not undoing mvy*stride-related integer overflows. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
-rw-r--r--libavcodec/wmv2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index 918d438..eea819b 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -94,7 +94,8 @@ void ff_mspel_motion(MpegEncContext *s,
{
Wmv2Context * const w= (Wmv2Context*)s;
uint8_t *ptr;
- int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
+ int dxy, mx, my, src_x, src_y, v_edge_pos;
+ ptrdiff_t offset, linesize, uvlinesize;
int emu=0;
dxy = ((motion_y & 1) << 1) | (motion_x & 1);
OpenPOWER on IntegriCloud