vdpau: deprecate old codec-specific pixel formats

[ffmpeg] / libavutil / adler32.c

diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index ee1f70e47977ebb8f19d3f850f4782ef287453fd..7f5afdbc40450fb8a86a7c089b8259ba6f477c95 100644 (file)
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -26,24 +26,28 @@
 
 #define BASE 65521L /* largest prime smaller than 65536 */
 
-#define DO1(buf)  {s1 += *buf++; s2 += s1;}
+#define DO1(buf)  { s1 += *buf++; s2 += s1; }
 #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 av_adler32_update(unsigned long adler, const uint8_t * buf,
+                                unsigned int len)
 {
     unsigned long s1 = adler & 0xffff;
     unsigned long s2 = adler >> 16;
 
-    while (len>0) {
+    while (len > 0) {
 #if CONFIG_SMALL
-        while(len>4 && s2 < (1U<<31)){
-            DO4(buf); len-=4;
+        while (len > 4  && s2 < (1U << 31)) {
+            DO4(buf);
+            len -= 4;
+        }
 #else
-        while(len>16 && s2 < (1U<<31)){
-            DO16(buf); len-=16;
-#endif
+        while (len > 16 && s2 < (1U << 31)) {
+            DO16(buf);
+            len -= 16;
         }
+#endif
         DO1(buf); len--;
         s1 %= BASE;
         s2 %= BASE;
@@ -56,14 +60,18 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigne
 #include "log.h"
 #include "timer.h"
 #define LEN 7001
-volatile int checksum;
+
+static volatile int checksum;
+
 int main(int argc, char **argv)
 {
     int i;
     char data[LEN];
+
     av_log_set_level(AV_LOG_DEBUG);
-    for(i=0; i<LEN; i++)
-        data[i]= ((i*i)>>3) + 123*i;
+
+    for (i = 0; i < LEN; i++)
+        data[i] = ((i * i) >> 3) + 123 * i;
 
     if (argc > 1 && !strcmp(argv[1], "-t")) {
         for (i = 0; i < 1000; i++) {
@@ -76,6 +84,6 @@ int main(int argc, char **argv)
     }
 
     av_log(NULL, AV_LOG_DEBUG, "%X (expected 50E6E508)\n", checksum);
-    return checksum == 0x50e6e508? 0 : 1;
+    return checksum == 0x50e6e508 ? 0 : 1;
 }
 #endif