summaryrefslogtreecommitdiff
path: root/libavcodec/x86/videodsp_init.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/x86/videodsp_init.c
parent7381d31f2267489ed5e939707b7e77a20adc168d (diff)
downloadffmpeg-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/x86/videodsp_init.c')
-rw-r--r--libavcodec/x86/videodsp_init.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c
index 95c71a280f..17a90115cf 100644
--- a/libavcodec/x86/videodsp_init.c
+++ b/libavcodec/x86/videodsp_init.c
@@ -39,14 +39,13 @@ extern emu_edge_core_func ff_emu_edge_core_mmx;
extern emu_edge_core_func ff_emu_edge_core_sse;
static av_always_inline void emulated_edge_mc(uint8_t *buf, const uint8_t *src,
- ptrdiff_t linesize_arg,
+ ptrdiff_t linesize,
int block_w, int block_h,
int src_x, int src_y,
int w, int h,
emu_edge_core_func *core_fn)
{
int start_y, start_x, end_y, end_x, src_y_add = 0;
- emuedge_linesize_type linesize = linesize_arg;
if(!w || !h)
return;