[FFmpeg-cvslog] 8svx: remove malloc and memcpy that have become unneeded

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  2 22:44:09 2012 +0200| [d4e82a341e1a5f1e3d04a4115ed29429b6c05943] | committer: Michael Niedermayer

8svx: remove malloc and memcpy that have become unneeded

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

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

 libavcodec/8svx.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index 0da4898..87653a8 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -94,7 +94,6 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
 
     /* decode and interleave the first packet */
     if (!esc->samples && avpkt) {
-        uint8_t *deinterleaved_samples, *p = NULL;
         int packet_size = avpkt->size;
 
         if (packet_size % avctx->channels) {
@@ -119,23 +118,17 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
                 av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
                 return AVERROR(EINVAL);
             }
-            if (!(deinterleaved_samples = av_mallocz(n)))
-                return AVERROR(ENOMEM);
-            dst = p = deinterleaved_samples;
 
             /* the uncompressed starting value is contained in the first byte */
-            dst = deinterleaved_samples;
+            dst = esc->samples;
             for (i = 0; i < avctx->channels; i++) {
                 delta_decode(dst, buf + 1, buf_size / avctx->channels - 1, buf[0], esc->table);
                 buf += buf_size / avctx->channels;
                 dst += n / avctx->channels - 1;
             }
         } else {
-            deinterleaved_samples = avpkt->data;
+            memcpy(esc->samples, avpkt->data, esc->samples_size);
         }
-
-        memcpy(esc->samples, deinterleaved_samples, esc->samples_size);
-        av_freep(&p);
     }
 
     /* get output buffer */