diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-09 14:02:52 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-26 11:50:17 -0400 |
| commit | c3a92412c067ed3e38ad89756e3146468fd3073c (patch) | |
| tree | df43c6bbeed0bbb4fec7d7ec525f8ba0f85c41fe | |
| parent | b46e58f7410488f49b22d0bc5d32479f352a8d61 (diff) | |
| download | ffmpeg-c3a92412c067ed3e38ad89756e3146468fd3073c.tar.gz | |
alacdec: always use get_sbits_long() for uncompressed samples
| -rw-r--r-- | libavcodec/alac.c | 12 |
1 files changed, 1 insertions, 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; |