[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c, 1.192, 1.193 mpegvideo.c, 1.510, 1.511 vorbis.c, 1.18, 1.19 vp3.c, 1.78, 1.79

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv22280

Modified Files:
	h264.c mpegvideo.c vorbis.c vp3.c 
Log Message:
kill some warnings


Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- h264.c	25 Feb 2006 22:15:24 -0000	1.192
+++ h264.c	25 Feb 2006 22:41:06 -0000	1.193
@@ -5388,8 +5388,6 @@
 };
 
 static int decode_cabac_mb_cbp_luma( H264Context *h) {
-    MpegEncContext * const s = &h->s;
-
     int cbp = 0;
     int cbp_b = -1;
     int i8x8;

Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -d -r1.510 -r1.511
--- mpegvideo.c	6 Feb 2006 11:21:26 -0000	1.510
+++ mpegvideo.c	25 Feb 2006 22:41:06 -0000	1.511
@@ -2230,7 +2230,8 @@
         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++){

Index: vorbis.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- vorbis.c	5 Feb 2006 10:16:20 -0000	1.18
+++ vorbis.c	25 Feb 2006 22:41:06 -0000	1.19
@@ -1345,7 +1345,7 @@
 
                         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;
 

Index: vp3.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- vp3.c	5 Feb 2006 13:35:17 -0000	1.78
+++ vp3.c	25 Feb 2006 22:41:06 -0000	1.79
@@ -328,7 +328,6 @@
     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 @@
     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;