From 4cd22b77380e6e3411fdfa0cb6c8c2b5def973fc Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 19 Jul 2012 19:47:08 -0400 Subject: alac: fix channel pointer assignment for 24 and 32-bit Needs to be done separately for each element. --- libavcodec/alac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/alac.c') 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]; -- cgit v1.1