[Ffmpeg-cvslog] r5786 - in trunk: libavformat/crc.c libavutil/adler32.c

[michael]

Author: michael
Date: Wed Jul 19 10:39:50 2006
New Revision: 5786

Modified:
   trunk/libavformat/crc.c
   trunk/libavutil/adler32.c

Log:
simplify


Modified: trunk/libavformat/crc.c
==============================================================================
--- trunk/libavformat/crc.c	(original)
+++ trunk/libavformat/crc.c	Wed Jul 19 10:39:50 2006
@@ -29,7 +29,7 @@
     CRCState *crc = s->priv_data;
 
     /* init CRC */
-    crc->crcval = av_adler32_update(0, NULL, 0);
+    crc->crcval = 1;
 
     return 0;
 }

Modified: trunk/libavutil/adler32.c
==============================================================================
--- trunk/libavutil/adler32.c	(original)
+++ trunk/libavutil/adler32.c	Wed Jul 19 10:39:50 2006
@@ -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) {