[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec dsputil.c, 1.124, 1.125 h264.c, 1.149, 1.150 indeo2.c, 1.5, 1.6 motion_est.c, 1.108, 1.109 mpeg12.c, 1.241, 1.242 mpegvideo.c, 1.487, 1.488 ulti.c, 1.2, 1.3 vp3.c, 1.68, 1.69 vp3dsp.c, 1.5, 1.6

Måns Rullgård CVS mru
Sun Aug 14 17:42:44 CEST 2005 

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

Modified Files:
	dsputil.c h264.c indeo2.c motion_est.c mpeg12.c mpegvideo.c 
	ulti.c vp3.c vp3dsp.c 
Log Message:
kill a bunch of compiler warnings


Index: dsputil.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- dsputil.c	17 Jun 2005 08:24:35 -0000	1.124
+++ dsputil.c	14 Aug 2005 15:42:39 -0000	1.125
@@ -2988,7 +2988,8 @@
     return s;
 }
 
-static int nsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){
+static int nsse16_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h){
+    MpegEncContext *c = v;
     int score1=0;
     int score2=0;
     int x,y;
@@ -3013,7 +3014,8 @@
     else  return score1 + ABS(score2)*8;
 }
 
-static int nsse8_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){
+static int nsse8_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h){
+    MpegEncContext *c = v;
     int score1=0;
     int score2=0;
     int x,y;

Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- h264.c	1 Aug 2005 14:47:07 -0000	1.149
+++ h264.c	14 Aug 2005 15:42:39 -0000	1.150
@@ -1277,9 +1277,9 @@
             fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref[0], 1);
             fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1);
             if(!IS_INTRA(mb_type_col) 
-               && (   l1ref0[0] == 0 && ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1
-                   || l1ref0[0]  < 0 && l1ref1[0] == 0 && ABS(l1mv1[0][0]) <= 1 && ABS(l1mv1[0][1]) <= 1
-                      && (h->x264_build>33 || !h->x264_build))){
+               && (   (l1ref0[0] == 0 && ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1)
+                   || (l1ref0[0]  < 0 && l1ref1[0] == 0 && ABS(l1mv1[0][0]) <= 1 && ABS(l1mv1[0][1]) <= 1
+                       && (h->x264_build>33 || !h->x264_build)))){
                 if(ref[0] > 0)
                     fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4);
                 else
@@ -1308,8 +1308,8 @@
     
                 /* col_zero_flag */
                 if(!IS_INTRA(mb_type_col) && (   l1ref0[x8 + y8*h->b8_stride] == 0 
-                                              || l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0 
-                                                 && (h->x264_build>33 || !h->x264_build))){
+                                              || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0 
+                                                  && (h->x264_build>33 || !h->x264_build)))){
                     const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1;
                     for(i4=0; i4<4; i4++){
                         const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
@@ -1347,7 +1347,7 @@
                 const int x8 = i8&1;
                 const int y8 = i8>>1;
                 int ref0, dist_scale_factor;
-                int16_t (*l1mv)[2]= l1mv0;
+                const int16_t (*l1mv)[2]= l1mv0;
 
                 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
                     continue;
@@ -2327,7 +2327,7 @@
     const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \
                      + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \
     PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \
-    const int l7 = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2
+    const int l7 attribute_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2
 
 #define PT(x) \
     const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2;
@@ -2335,7 +2335,7 @@
     const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \
                      + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \
     PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \
-    const int t7 = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \
+    const int t7 attribute_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \
                      + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2
 
 #define PTR(x) \
@@ -6188,7 +6188,7 @@
     }
 }
 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
-    int i, d;
+    int i;
     const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
     const int alpha = alpha_table[index_a];
     const int beta  = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];
@@ -6418,7 +6418,7 @@
 }
 
 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
-    int i, d;
+    int i;
     const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
     const int alpha = alpha_table[index_a];
     const int beta  = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];

Index: indeo2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/indeo2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- indeo2.c	9 Jul 2005 21:39:29 -0000	1.5
+++ indeo2.c	14 Aug 2005 15:42:39 -0000	1.6
@@ -141,7 +141,6 @@
     AVFrame *picture = data;
     AVFrame * const p= (AVFrame*)&s->picture;
     int start;
-    int i;
 
     if(p->data[0])
         avctx->release_buffer(avctx, p);

Index: motion_est.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/motion_est.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- motion_est.c	1 Aug 2005 20:01:41 -0000	1.108
+++ motion_est.c	14 Aug 2005 15:42:39 -0000	1.109
@@ -175,7 +175,7 @@
         }else
             d= 256*256*256*32;
     }else{
-        int uvdxy;
+        int uvdxy;              /* no, it might not be used uninitialized */
         if(dxy){
             if(qpel){
                 c->qpel_put[size][dxy](c->temp, ref[0] + x + y*stride, stride); //FIXME prototype (add h)
@@ -1563,7 +1563,6 @@
     MotionEstContext * const c= &s->me;
     uint8_t * const mv_penalty= c->mv_penalty[s->f_code] + MAX_MV; // f_code of the prev frame
     int stride= c->stride;
-    int uvstride= c->uvstride;
     uint8_t *dest_y = c->scratchpad;
     uint8_t *ptr;
     int dxy;

Index: mpeg12.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpeg12.c,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- mpeg12.c	14 Jul 2005 21:39:35 -0000	1.241
+++ mpeg12.c	14 Aug 2005 15:42:39 -0000	1.242
@@ -1810,7 +1810,6 @@
     RLTable *rl = &rl_mpeg1;
     uint8_t * const scantable= s->intra_scantable.permutated;
     const int qscale= s->qscale;
-    int v;
     OPEN_READER(re, &s->gb);
     i = -1;
 

Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -d -r1.487 -r1.488
--- mpegvideo.c	25 Jul 2005 23:07:27 -0000	1.487
+++ mpegvideo.c	14 Aug 2005 15:42:40 -0000	1.488
@@ -887,7 +887,7 @@
 int MPV_encode_init(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
-    int i, dummy;
+    int i;
     int chroma_h_shift, chroma_v_shift;
     
     MPV_encode_defaults(s);

Index: ulti.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ulti.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ulti.c	2 Jul 2005 19:10:30 -0000	1.2
+++ ulti.c	14 Aug 2005 15:42:40 -0000	1.3
@@ -37,7 +37,7 @@
     AVCodecContext *avctx;
     int width, height, blocks;
     AVFrame frame;
-    uint8_t *ulti_codebook;
+    const uint8_t *ulti_codebook;
 } UltimotionDecodeContext;
 
 static int ulti_decode_init(AVCodecContext *avctx)

Index: vp3.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- vp3.c	13 Aug 2005 18:49:01 -0000	1.68
+++ vp3.c	14 Aug 2005 15:42:40 -0000	1.69
@@ -1725,7 +1725,6 @@
     int plane_height;
     int slice_height;
     int current_macroblock_entry = slice * s->macroblock_width * 6;
-    int *bounding_values= s->bounding_values_array+127;
     int fragment_width;
 
     if (slice >= s->macroblock_height)

Index: vp3dsp.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vp3dsp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vp3dsp.c	17 May 2005 11:12:04 -0000	1.5
+++ vp3dsp.c	14 Aug 2005 15:42:40 -0000	1.6
@@ -45,7 +45,7 @@
     int _Ed, _Gd, _Add, _Bdd, _Fd, _Hd;
     int t1, t2;
 
-    int i, j;
+    int i;
     
     /* Inverse DCT on the rows now */
     for (i = 0; i < 8; i++) {

More information about the ffmpeg-cvslog mailing list