From f66ecdb1b4de01e4afdc1e2c8640ce57ddec15ff Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 4 Sep 2013 14:22:20 +0200 Subject: [PATCH] avcodec: add emuedge_linesize_type Currently all uses of the emu edge code as well as the code itself assume int linesize changing some but not changing all would introduce a security issue once all use this typedef a simple search and replace can be done to switch them all to ptrdiff_t Signed-off-by: Michael Niedermayer (cherry picked from commit 2ffead98ddd384f61cdf6b1cb3f36592f54cd34a) Conflicts: libavcodec/mpegvideo_common.h libavcodec/videodsp.h libavcodec/videodsp_template.c libavcodec/x86/videodsp_init.c --- libavcodec/dsputil.h | 1 + libavcodec/mpegvideo_common.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index a44c146af9..dd2737ea8b 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -33,6 +33,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" +typedef int emuedge_linesize_type; //#define DEBUG /* dct code */ diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h index debd6bae17..02b2bc1974 100644 --- a/libavcodec/mpegvideo_common.h +++ b/libavcodec/mpegvideo_common.h @@ -245,7 +245,7 @@ void mpeg_motion_internal(MpegEncContext *s, uint8_t *ptr_y, *ptr_cb, *ptr_cr; int dxy, uvdxy, mx, my, src_x, src_y, uvsrc_x, uvsrc_y, v_edge_pos; - ptrdiff_t uvlinesize, linesize; + emuedge_linesize_type uvlinesize, linesize; #if 0 if(s->quarter_sample)