[FFmpeg-cvslog] r12868 - trunk/libavcodec/alac.c

[michael]

Author: michael
Date: Thu Apr 17 04:30:00 2008
New Revision: 12868

Log:
simplify


Modified:
   trunk/libavcodec/alac.c

Modified: trunk/libavcodec/alac.c
==============================================================================
--- trunk/libavcodec/alac.c	(original)
+++ trunk/libavcodec/alac.c	Thu Apr 17 04:30:00 2008
@@ -184,11 +184,9 @@ static void bastardized_rice_decompress(
             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) {