Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / lagarithrac.c

diff --git a/libavcodec/lagarithrac.c b/libavcodec/lagarithrac.c
index 9f7bc41ef52b20c81667c9edca29d030f8c846d2..895acb0d354bc6598003418d4b2b39f2f1766fc6 100644 (file)
--- a/libavcodec/lagarithrac.c
+++ b/libavcodec/lagarithrac.c
@@ -45,7 +45,7 @@ void ff_lag_rac_init(lag_rac *l, GetBitContext *gb, int length)
 
     l->range        = 0x80;
     l->low          = *l->bytestream >> 1;
-    l->hash_shift   = FFMAX(l->scale - 8, 0);
+    l->hash_shift   = FFMAX((int)l->scale - 8, 0);
 
     for (i = j = 0; i < 256; i++) {
         unsigned r = i << l->hash_shift;