[FFmpeg-cvslog] alacdec: always use get_sbits_long() for uncompressed samples

Justin Ruggles git at videolan.org
Thu Oct 27 01:46:42 CEST 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Oct  9 14:02:52 2011 -0400| [c3a92412c067ed3e38ad89756e3146468fd3073c] | committer: Justin Ruggles

alacdec: always use get_sbits_long() for uncompressed samples

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

 libavcodec/alac.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 5ff8cad..f61d31f 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;



More information about the ffmpeg-cvslog mailing list