[FFmpeg-cvslog] avcodec: add emuedge_linesize_type

Michael Niedermayer git at videolan.org
Fri Sep 27 02:57:30 CEST 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  4 14:22:20 2013 +0200| [f66ecdb1b4de01e4afdc1e2c8640ce57ddec15ff] | committer: Michael Niedermayer

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 <michaelni at gmx.at>
(cherry picked from commit 2ffead98ddd384f61cdf6b1cb3f36592f54cd34a)

Conflicts:

	libavcodec/mpegvideo_common.h
	libavcodec/videodsp.h
	libavcodec/videodsp_template.c
	libavcodec/x86/videodsp_init.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f66ecdb1b4de01e4afdc1e2c8640ce57ddec15ff
---

 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 a44c146..dd2737e 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 debd6ba..02b2bc1 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)



More information about the ffmpeg-cvslog mailing list