[FFmpeg-cvslog] Replace a av_fast_malloc with av_fast_padded_malloc.

Reimar Döffinger git at videolan.org
Wed Jan 18 22:04:35 CET 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Wed Jan 18 22:00:27 2012 +0100| [6fd4b8a6ef13bd2d47521ed6894d25de45610291] | committer: Reimar Döffinger

Replace a av_fast_malloc with av_fast_padded_malloc.

This one was missed in the previous fraps fix, the
allocation is exactly the same in both cases.
Fixes fraps-v5 under valgrind.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 libavcodec/fraps.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 8a47aee..c5ddd54 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -321,7 +321,7 @@ static int decode_frame(AVCodecContext *avctx,
         }
         offs[planes] = buf_size;
         for(i = 0; i < planes; i++){
-            av_fast_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024 + FF_INPUT_BUFFER_PADDING_SIZE);
+            av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024);
             if (!s->tmpbuf)
                 return AVERROR(ENOMEM);
             if(fraps2_decode_plane(s, f->data[0] + i + (f->linesize[0] * (avctx->height - 1)), -f->linesize[0],



More information about the ffmpeg-cvslog mailing list