diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-09-27 20:13:59 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-28 11:28:09 +0200 |
| commit | c341f734e5f9d6af4a8fdcceb6f5d12de6395c76 (patch) | |
| tree | 42c66699b2e6685e3c4ab67d32a6d0dec7a6e2be /libavcodec/videodsp_template.c | |
| parent | 7381d31f2267489ed5e939707b7e77a20adc168d (diff) | |
| download | ffmpeg-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/videodsp_template.c')
| -rw-r--r-- | libavcodec/videodsp_template.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/videodsp_template.c b/libavcodec/videodsp_template.c index 1f709c499d..39aad4deec 100644 --- a/libavcodec/videodsp_template.c +++ b/libavcodec/videodsp_template.c @@ -21,13 +21,12 @@ #include "bit_depth_template.c" void FUNC(ff_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) { int x, y; int start_y, start_x, end_y, end_x; - emuedge_linesize_type linesize = linesize_arg; if (!w || !h) return; |