From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 17 Apr 2008 02:30:00 +0000 (+0000)
Subject: simplify
X-Git-Tag: v0.5~5068
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea3372a256a3a66ebecb16227ce9d59074ed7a1c;p=platform%2Fupstream%2Flibav.git

simplify

Originally committed as revision 12868 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index d93dfd2..35d6271 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -184,11 +184,9 @@ static void bastardized_rice_decompress(ALACContext *alac,
             int k; /* size of extra bits */
 
             /* read k, that is bits as is */
-            k = 31 - rice_kmodifier - count_leading_zeros((history >> 9) + 3);
+            k = 31 - count_leading_zeros((history >> 9) + 3);
 
-            if (k < 0)
-                k += rice_kmodifier;
-            else
+            if (k >= rice_kmodifier)
                 k = rice_kmodifier;
 
             if (k != 1) {