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/mpegvideo_enc.c | |
| parent | 7381d31f2267489ed5e939707b7e77a20adc168d (diff) | |
| download | android_external_ffmpeg-c341f734e5f9d6af4a8fdcceb6f5d12de6395c76.tar.gz android_external_ffmpeg-c341f734e5f9d6af4a8fdcceb6f5d12de6395c76.tar.bz2 android_external_ffmpeg-c341f734e5f9d6af4a8fdcceb6f5d12de6395c76.zip | |
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/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a85cf563de..6f0d96168a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -985,7 +985,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) direct = 0; av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0], - pic_arg->linesize[1], s->linesize, s->uvlinesize); + pic_arg->linesize[1], (int) s->linesize, (int) s->uvlinesize); if (direct) { i = ff_find_unused_picture(s, 1); @@ -1771,7 +1771,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int dct_offset = s->linesize * 8; // default for progressive frames int uv_dct_offset = s->uvlinesize * 8; uint8_t *ptr_y, *ptr_cb, *ptr_cr; - int wrap_y, wrap_c; + ptrdiff_t wrap_y, wrap_c; for (i = 0; i < mb_block_count; i++) skip_dct[i] = s->skipdct; |