[SCM] libav/experimental: cleanup suggested by Michael Niedermayer
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:49:05 UTC 2013
The following commit has been merged in the experimental branch:
commit 38603ff65d956c6af61021662cfc76d6e54d1d34
Author: Måns Rullgård <mans at mansr.com>
Date: Thu Jul 13 21:41:28 2006 +0000
cleanup suggested by Michael Niedermayer
Originally committed as revision 5732 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index ab0b86d..1d814b4 100644
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -25,15 +25,17 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigne
if (buf == NULL) return 1L;
while (len > 0) {
- k = len < NMAX ? len : NMAX;
+ k = FFMIN(len, NMAX);
len -= k;
+#ifndef CONFIG_SMALL
while (k >= 16) {
DO16(buf);
k -= 16;
}
- if (k != 0) do {
+#endif
+ while(k--) {
DO1(buf);
- } while (--k);
+ }
s1 %= BASE;
s2 %= BASE;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list