[FFmpeg-cvslog] alac: fix channel pointer assignment for 24 and 32-bit

Justin Ruggles git at videolan.org
Sat Jul 21 04:53:08 CEST 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Jul 19 19:47:08 2012 -0400| [4cd22b77380e6e3411fdfa0cb6c8c2b5def973fc] | committer: Justin Ruggles

alac: fix channel pointer assignment for 24 and 32-bit

Needs to be done separately for each element.

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

 libavcodec/alac.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 310a1f0..aa2e6c8 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -322,16 +322,16 @@ static int decode_element(AVCodecContext *avctx, void *data, int ch_index,
             av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
             return ret;
         }
-        if (alac->sample_size > 16) {
-            for (ch = 0; ch < channels; ch++)
-                alac->output_samples_buffer[ch] = (int32_t *)alac->frame.extended_data[ch_index + ch];
-        }
     } else if (output_samples != alac->nb_samples) {
         av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %u != %d\n",
                output_samples, alac->nb_samples);
         return AVERROR_INVALIDDATA;
     }
     alac->nb_samples = output_samples;
+    if (alac->sample_size > 16) {
+        for (ch = 0; ch < channels; ch++)
+            alac->output_samples_buffer[ch] = (int32_t *)alac->frame.extended_data[ch_index + ch];
+    }
 
     if (is_compressed) {
         int16_t lpc_coefs[2][32];



More information about the ffmpeg-cvslog mailing list