some warning fixes

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1977 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index bc36f1b003255fa06a61aa04534b085231d1d26f..296feec5cc88517467da13db64a51eae8017cd0a 100644 (file)
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -125,9 +125,9 @@ static inline int decode_block(ASV1Context *a, DCTELEM block[64]){
             }
 
             if(ccp&1) block[a->scantable.permutated[4*i+0]]= (get_level(&a->gb) * a->intra_matrix[4*i+0])>>4;
-            if(ccp&2) block[a->scantable.permutated[4*i+1]]= (get_level(&a->gb) * a->intra_matrix[4*i+1])>>4;;
-            if(ccp&4) block[a->scantable.permutated[4*i+2]]= (get_level(&a->gb) * a->intra_matrix[4*i+2])>>4;;
-            if(ccp&8) block[a->scantable.permutated[4*i+3]]= (get_level(&a->gb) * a->intra_matrix[4*i+3])>>4;;
+            if(ccp&2) block[a->scantable.permutated[4*i+1]]= (get_level(&a->gb) * a->intra_matrix[4*i+1])>>4;
+            if(ccp&4) block[a->scantable.permutated[4*i+2]]= (get_level(&a->gb) * a->intra_matrix[4*i+2])>>4;
+            if(ccp&8) block[a->scantable.permutated[4*i+3]]= (get_level(&a->gb) * a->intra_matrix[4*i+3])>>4;
         }
     }
 

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 97af5b95c06cbc5e04f7feb91b84f0afd7150349..e73f32d7a2332337a288094ccf97c55473e9c0d1 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4009,8 +4009,8 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
     MpegEncContext * const s = &h->s;
     AVCodecContext * const avctx= s->avctx;
     int buf_index=0;
-    int i;
 #if 0
+    int i;
     for(i=0; i<32; i++){
         printf("%X ", buf[i]);
     }

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index ec80464468af92c9e96a4d8f22dbe5cd74fb5f1f..454238a4c280e53f8e722bbcbd81faa0691fb6fb 100644 (file)
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1599,7 +1599,7 @@ out:
 static int mjpeg_decode_com(MJpegDecodeContext *s)
 {
     /* XXX: verify len field validity */
-    unsigned int len = get_bits(&s->gb, 16);
+    int len = get_bits(&s->gb, 16);
     if (len >= 2 && len < 32768) {
        /* XXX: any better upper bound */
        uint8_t *cbuf = av_malloc(len - 1);