From c3a92412c067ed3e38ad89756e3146468fd3073c Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 9 Oct 2011 14:02:52 -0400 Subject: [PATCH] alacdec: always use get_sbits_long() for uncompressed samples --- libavcodec/alac.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 5ff8cad8b4..f61d31f926 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -481,21 +481,11 @@ static int alac_decode_frame(AVCodecContext *avctx, } else { /* not compressed, easy case */ int i, chan; - if (alac->setinfo_sample_size <= 16) { - for (i = 0; i < outputsamples; i++) + for (i = 0; i < outputsamples; i++) { for (chan = 0; chan < channels; chan++) { alac->outputsamples_buffer[chan][i] = get_sbits_long(&alac->gb, alac->setinfo_sample_size); } - } else { - for (i = 0; i < outputsamples; i++) { - for (chan = 0; chan < channels; chan++) { - alac->outputsamples_buffer[chan][i] = get_bits(&alac->gb, - alac->setinfo_sample_size); - alac->outputsamples_buffer[chan][i] = sign_extend(alac->outputsamples_buffer[chan][i], - alac->setinfo_sample_size); - } - } } alac->extra_bits = 0; interlacing_shift = 0;