From 5c210e2cb9d7fbdd6175e116502c8ce23267843c Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Thu, 3 Nov 2011 20:54:38 -0400
Subject: [PATCH] shorten: do not modify samples pointer when interleaving

---
 libavcodec/shorten.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index f510bcc3803..da36bd58eb0 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -252,12 +252,13 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header,
     return 0;
 }
 
-static int16_t * interleave_buffer(int16_t *samples, int nchan, int blocksize, int32_t **buffer) {
+static void interleave_buffer(int16_t *samples, int nchan, int blocksize,
+                              int32_t **buffer)
+{
     int i, chan;
     for (i=0; i<blocksize; i++)
         for (chan=0; chan < nchan; chan++)
             *samples++ = av_clip_int16(buffer[chan][i]);
-    return samples;
 }
 
 static const int fixed_coeffs[3][3] = {
@@ -576,7 +577,7 @@ static int shorten_decode_frame(AVCodecContext *avctx,
                     av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
                     return AVERROR(EINVAL);
                 }
-                samples = interleave_buffer(samples, s->channels, s->blocksize, s->decoded);
+                interleave_buffer(samples, s->channels, s->blocksize, s->decoded);
                 *data_size = out_size;
             }
         }
-- 
2.39.2