simplify

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

simplify
Originally committed as revision 12868 to svn://svn.ffmpeg.org/ffmpeg/trunk
ea3372a2 · Michael Niedermayer · b153c68b · ea3372a2
Commit ea3372a2 authored Apr 17, 2008 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

alac.c libavcodec/alac.c +2 -4

No files found.
--- 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) {