[FFmpeg-cvslog] mpegvideo: increase scratchpad sizes

Michael Niedermayer git at videolan.org
Thu Dec 20 04:16:47 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 20 03:53:27 2012 +0100| [73db0bf1b06084022db5f42377b3b7960b3d3f5e] | committer: Michael Niedermayer

mpegvideo: increase scratchpad sizes

These where reduced in f1d8763a02b5fce9a7d9789e049d74a45b15e1e8
and this change can cause out of array accesses.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mpegvideo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 5889e1c..43671ee 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -244,7 +244,7 @@ int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize)
     FF_ALLOCZ_OR_GOTO(s->avctx, s->edge_emu_buffer, alloc_size * 4 * 24,
                       fail);
 
-    FF_ALLOCZ_OR_GOTO(s->avctx, s->me.scratchpad, alloc_size * 2 * 16 * 2,
+    FF_ALLOCZ_OR_GOTO(s->avctx, s->me.scratchpad, alloc_size * 4 * 16 * 2,
                       fail)
     s->me.temp         = s->me.scratchpad;
     s->rd_scratchpad   = s->me.scratchpad;



More information about the ffmpeg-cvslog mailing list