From e4169612a150353cb463ba2c23e88ce1ac254e93 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Mon, 30 Jan 2012 14:57:21 -0500
Subject: [PATCH] apedec: av_fast_malloc() instead of av_realloc()

av_realloc() does not guarantee alignment, which is required for
DSPContext.bswap_buf().
---
 libavcodec/apedec.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index c9bcc0919d..f2504faed6 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -155,6 +155,7 @@ typedef struct APEContext {
 
     uint8_t *data;                           ///< current frame data
     uint8_t *data_end;                       ///< frame data end
+    int data_size;                           ///< frame data allocated size
     const uint8_t *ptr;                      ///< current position in frame data
 
     int error;
@@ -171,6 +172,8 @@ static av_cold int ape_decode_close(AVCodecContext *avctx)
         av_freep(&s->filterbuf[i]);
 
     av_freep(&s->data);
+    s->data_size = 0;
+
     return 0;
 }
 
@@ -826,7 +829,6 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
 
     if(!s->samples){
         uint32_t nblocks, offset;
-        void *tmp_data;
         int buf_size;
 
         if (!avpkt->size) {
@@ -843,10 +845,9 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
                    "extra bytes at the end will be skipped.\n");
         }
 
-        tmp_data = av_realloc(s->data, buf_size);
-        if (!tmp_data)
+        av_fast_malloc(&s->data, &s->data_size, buf_size);
+        if (!s->data)
             return AVERROR(ENOMEM);
-        s->data = tmp_data;
         s->dsp.bswap_buf((uint32_t*)s->data, (const uint32_t*)buf, buf_size >> 2);
         s->ptr = s->data;
         s->data_end = s->data + buf_size;