Mercurial > libavcodec.hg
changeset 2834:fd5d7c732c6b libavcodec
kill a bunch of compiler warnings
| author | mru |
|---|---|
| date | Sun, 14 Aug 2005 15:42:40 +0000 |
| parents | 1f117208d20f |
| children | d4c4b84e0fac |
| files | dsputil.c h264.c i386/vp3dsp_sse2.c indeo2.c motion_est.c mpeg12.c mpegvideo.c ulti.c vp3.c vp3dsp.c |
| diffstat | 10 files changed, 18 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.c Sun Aug 14 01:15:27 2005 +0000 +++ b/dsputil.c Sun Aug 14 15:42:40 2005 +0000 @@ -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;
--- a/h264.c Sun Aug 14 01:15:27 2005 +0000 +++ b/h264.c Sun Aug 14 15:42:40 2005 +0000 @@ -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 )];
--- a/i386/vp3dsp_sse2.c Sun Aug 14 01:15:27 2005 +0000 +++ b/i386/vp3dsp_sse2.c Sun Aug 14 15:42:40 2005 +0000 @@ -799,7 +799,6 @@ void ff_vp3_idct_sse2(int16_t *input_data) { unsigned char *input_bytes = (unsigned char *)input_data; - unsigned char *dequant_const_bytes = (unsigned char *)SSE2_dequant_const; unsigned char *output_data_bytes = (unsigned char *)input_data; unsigned char *idct_data_bytes = (unsigned char *)SSE2_idct_data; unsigned char *Eight = (unsigned char *)eight_data;
--- a/indeo2.c Sun Aug 14 01:15:27 2005 +0000 +++ b/indeo2.c Sun Aug 14 15:42:40 2005 +0000 @@ -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);
--- a/motion_est.c Sun Aug 14 01:15:27 2005 +0000 +++ b/motion_est.c Sun Aug 14 15:42:40 2005 +0000 @@ -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;
--- a/mpeg12.c Sun Aug 14 01:15:27 2005 +0000 +++ b/mpeg12.c Sun Aug 14 15:42:40 2005 +0000 @@ -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;
--- a/mpegvideo.c Sun Aug 14 01:15:27 2005 +0000 +++ b/mpegvideo.c Sun Aug 14 15:42:40 2005 +0000 @@ -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);
--- a/ulti.c Sun Aug 14 01:15:27 2005 +0000 +++ b/ulti.c Sun Aug 14 15:42:40 2005 +0000 @@ -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)
--- a/vp3.c Sun Aug 14 01:15:27 2005 +0000 +++ b/vp3.c Sun Aug 14 15:42:40 2005 +0000 @@ -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)