diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index f43deb1d72..bd54994b5b 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -154,8 +154,8 @@ typedef struct SnowContext{
     Plane plane[MAX_PLANES];
     BlockNode *block;
 #define ME_CACHE_SIZE 1024
-    int me_cache[ME_CACHE_SIZE];
-    int me_cache_generation;
+    unsigned me_cache[ME_CACHE_SIZE];
+    unsigned me_cache_generation;
     slice_buffer sb;
     int memc_only;
 
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 4926eef5d2..cd60c3a512 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -958,7 +958,8 @@ static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int
     const int b_stride= s->b_width << s->block_max_depth;
     BlockNode *block= &s->block[mb_x + mb_y * b_stride];
     BlockNode backup= *block;
-    int rd, index, value;
+    unsigned value;
+    int rd, index;
 
     assert(mb_x>=0 && mb_y>=0);
     assert(mb_x<b_stride);
@@ -1003,7 +1004,8 @@ static av_always_inline int check_4block_inter(SnowContext *s, int mb_x, int mb_
     const int b_stride= s->b_width << s->block_max_depth;
     BlockNode *block= &s->block[mb_x + mb_y * b_stride];
     BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]};
-    int rd, index, value;
+    unsigned value;
+    int rd, index;
 
     assert(mb_x>=0 && mb_y>=0);
     assert(mb_x<b_stride);