@@ -79,7 +79,7 @@ static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t

     for(i = 0; i < 4; i++, dst += r->s.b4_stride - 4){

         for(j = 0; j < 4; j+= 2){

             int code = svq3_get_ue_golomb(gb) << 1;

-            if(code >= 81*2){

+            if(code >= 81U*2U){

                 av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n");

                 return -1;

             }

@@ -108,7 +108,7 @@ static int rv30_decode_mb_info(RV34DecContext *r)

     GetBitContext *gb = &s->gb;

     int code = svq3_get_ue_golomb(gb);

-    if(code > 11){

+    if(code > 11U){

         av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n");

         return -1;

     }

@@ -207,8 +207,11 @@ static int rv40_decode_mb_info(RV34DecContext *r)

     int blocks[RV34_MB_TYPES] = {0};

     int count = 0;

-    if(!r->s.mb_skip_run)

+    if(!r->s.mb_skip_run) {

         r->s.mb_skip_run = svq3_get_ue_golomb(gb) + 1;

+        if(r->s.mb_skip_run > (unsigned)s->mb_num)

+            return -1;

+    }

     if(--r->s.mb_skip_run)

          return RV34_MB_SKIP;

@@ -202,7 +202,7 @@ static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,

     for (limit = (16 >> intra); index < 16; index = limit, limit += 8) {

         for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) {

-          if (vlc == INVALID_VLC)

+          if (vlc < 0)

               return -1;

           sign = (vlc & 0x1) - 1;

@@ -220,7 +220,7 @@ static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,

                   level = ((vlc + 9) >> 2) - run;

               }

           } else {

-              if (vlc < 16) {

+              if (vlc < 16U) {

                   run   = svq3_dct_tables[intra][vlc].run;

                   level = svq3_dct_tables[intra][vlc].level;

               } else if (intra) {

@@ -549,7 +549,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)

             for (i = 0; i < 16; i+=2) {

                 vlc = svq3_get_ue_golomb(&s->gb);

-                if (vlc >= 25){

+                if (vlc >= 25U){

                     av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);

                     return -1;

                 }

@@ -620,7 +620,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)

     }

     if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) {

-        if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48){

+        if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48U){

             av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);

             return -1;

         }

@@ -630,7 +630,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)

     if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) {

         s->qscale += svq3_get_se_golomb(&s->gb);

-        if (s->qscale > 31){

+        if (s->qscale > 31U){

             av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);

             return -1;

         }

@@ -727,7 +727,7 @@ static int svq3_decode_slice_header(H264Context *h)

         skip_bits_long(&s->gb, 0);

     }

-    if ((i = svq3_get_ue_golomb(&s->gb)) == INVALID_VLC || i >= 3){

+    if ((i = svq3_get_ue_golomb(&s->gb)) >= 3U){

         av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i);

         return -1;

     }