kill some warnings

Originally committed as revision 5063 to svn://svn.ffmpeg.org/ffmpeg/trunk

4 files changed, 3 insertions, 45 deletions

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 770d552f65..9dfc89e234 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -5388,8 +5388,6 @@ static const uint8_t block_idx_xy[4][4] = {
 };
 
 static int decode_cabac_mb_cbp_luma( H264Context *h) {
-    MpegEncContext * const s = &h->s;
-
     int cbp = 0;
     int cbp_b = -1;
     int i8x8;
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a7ae07b412..bfa58e826b 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2230,7 +2230,8 @@ static int estimate_best_b_count(MpegEncContext *s){
         input[i].linesize[2]= c->width/2;
 
         if(!i || s->input_picture[i-1])
-            img_resample(resample, &input[i], &pre_input);
+            img_resample(resample, (AVPicture*)&input[i],
+                         (AVPicture*)&pre_input);
     }
 
     for(j=0; j<s->max_b_frames+1; j++){
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 9cc09bed17..0b4b8e1880 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -1345,7 +1345,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
 
                         AV_DEBUG("Classword: %d \n", temp);
 
-                        assert(vr->classifications > 1 && vr->classifications<256 && temp<=65536); //needed for inverse[]
+                        assert(vr->classifications > 1 && temp<=65536); //needed for inverse[]
                         for(i=0;i<c_p_c;++i) {
                             uint_fast32_t temp2;
 
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index a7a9e8bacd..163847013e 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -328,7 +328,6 @@ typedef struct Vp3DecodeContext {
     int bounding_values_array[256];
 } Vp3DecodeContext;
 
-static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb);
 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb);
 
 /************************************************************************
@@ -2737,46 +2736,6 @@ static inline int theora_get_32bit(GetBitContext gb)
     return ret;
 }
 
-static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb)
-{
-    Vp3DecodeContext *s = avctx->priv_data;
-    int len;
-
-    if (s->theora <= 0x030200)
-    {
-        int i, comments;
-
-        // vendor string
-        len = get_bits_long(&gb, 32);
-        len = le2me_32(len);
-        while(len--)
-            skip_bits(&gb, 8);
-
-        // user comments
-        comments = get_bits_long(&gb, 32);
-        comments = le2me_32(comments);
-        for (i = 0; i < comments; i++)
-        {
-            len = get_bits_long(&gb, 32);
-            len = be2me_32(len);
-            while(len--)
-                skip_bits(&gb, 8);
-        }
-    }
-    else
-    {
-        do {
-            len = get_bits_long(&gb, 32);
-            len = le2me_32(len);
-            if (len <= 0)
-                break;
-            while (len--)
-                skip_bits(&gb, 8);
-        } while (1);
-    }
-    return 0;
-}
-
 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb)
 {
     Vp3DecodeContext *s = avctx->priv_data;