Mercurial > libavutil.hg

changeset 83:4d16d6abcf65 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author michael
date Wed, 19 Jul 2006 08:39:50 +0000
parents 8fb151c4d4c7
children 3ceece5191f6
files adler32.c
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/adler32.c	Wed Jul 19 07:28:58 2006 +0000
+++ b/adler32.c	Wed Jul 19 08:39:50 2006 +0000
@@ -11,21 +11,16 @@
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
 #define DO1(buf)  {s1 += *buf++; s2 += s1;}
-#define DO2(buf)  DO1(buf); DO1(buf);
-#define DO4(buf)  DO2(buf); DO2(buf);
-#define DO8(buf)  DO4(buf); DO4(buf);
-#define DO16(buf) DO8(buf); DO8(buf);
+#define DO4(buf)  DO1(buf); DO1(buf); DO1(buf); DO1(buf);
+#define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(buf);
 
 unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len)
 {
     unsigned long s1 = adler & 0xffff;
     unsigned long s2 = (adler >> 16) & 0xffff;
-    int k;
-
-    if (buf == NULL) return 1L;
 
     while (len > 0) {
-        k = FFMIN(len, NMAX);
+        int k = FFMIN(len, NMAX);
         len -= k;
 #ifndef CONFIG_SMALL
         while (k >= 16) {