Deprecate PIX_FMT_YUVJ*

[ffmpeg] / libavutil / adler32.c

diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index e185a77c43238dfc0dc399664a9e741aa0a9a4be..4f2001025b372ad7c33c2cab76569e18c3b4b3f2 100644 (file)
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -1,9 +1,27 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
+/*
+ * Compute the Adler-32 checksum of a data stream.
+ * This is a modified version based on adler32.c from the zlib library.
+ *
  * Copyright (C) 1995 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include "common.h"
+#include "config.h"
 #include "adler32.h"
 
 #define BASE 65521L /* largest prime smaller than 65536 */
@@ -18,7 +36,7 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigne
     unsigned long s2 = adler >> 16;
 
     while (len>0) {
-#ifdef CONFIG_SMALL
+#if CONFIG_SMALL
         while(len>4 && s2 < (1U<<31)){
             DO4(buf); len-=4;
 #else
@@ -35,12 +53,13 @@ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigne
 
 #ifdef TEST
 #include "log.h"
+#include "timer.h"
 #define LEN 7001
 volatile int checksum;
-int main(){
+int main(void){
     int i;
     char data[LEN];
-    av_log_level = AV_LOG_DEBUG;
+    av_log_set_level(AV_LOG_DEBUG);
     for(i=0; i<LEN; i++)
         data[i]= ((i*i)>>3) + 123*i;
     for(i=0; i<1000; i++){
@@ -49,5 +68,6 @@ int main(){
         STOP_TIMER("adler")
     }
     av_log(NULL, AV_LOG_DEBUG, "%X == 50E6E508\n", checksum);
+    return 0;
 }
 #endif