]> git.sesse.net Git - ffmpeg/commitdiff
alacdec: always use get_sbits_long() for uncompressed samples
authorJustin Ruggles <justin.ruggles@gmail.com>
Sun, 9 Oct 2011 18:02:52 +0000 (14:02 -0400)
committerJustin Ruggles <justin.ruggles@gmail.com>
Wed, 26 Oct 2011 15:50:17 +0000 (11:50 -0400)
libavcodec/alac.c

index 5ff8cad8b416c7a2dee2ad6956bea2a815b24dd7..f61d31f9267ec9b2ff5f3b99be993231cc0b1d8a 100644 (file)
@@ -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;