Merge commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7'

[ffmpeg] / libavcodec / wavpack.h

diff --git a/libavcodec/wavpack.h b/libavcodec/wavpack.h
index c949390f516848e3cf9edc37d36b5a06fbb7074e..3ae601f91430f01df96d90fb64e47e3643cd5add 100644 (file)
--- a/libavcodec/wavpack.h
+++ b/libavcodec/wavpack.h
@@ -94,7 +94,7 @@ typedef struct Decorr {
 typedef struct WvChannel {
     int median[3];
     int slow_level, error_limit;
-    int bitrate_acc, bitrate_delta;
+    unsigned bitrate_acc, bitrate_delta;
 } WvChannel;
 
 // macros for manipulating median values
@@ -177,7 +177,7 @@ static av_always_inline int wp_exp2(int16_t val)
     return neg ? -res : res;
 }
 
-static av_always_inline int wp_log2(int32_t val)
+static av_always_inline int wp_log2(uint32_t val)
 {
     int bits;