Commit 1d94a662 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

simplify

Originally committed as revision 5786 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cfc4bd46
......@@ -29,7 +29,7 @@ static int crc_write_header(struct AVFormatContext *s)
CRCState *crc = s->priv_data;
/* init CRC */
crc->crcval = av_adler32_update(0, NULL, 0);
crc->crcval = 1;
return 0;
}
......
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment