# HG changeset patch # User mellum # Date 1052962487 0 # Node ID ec946cb7439728e8dfa30121e4cd2757367ce19c # Parent 09165461996f0d4e04ddfcdd5cbd46cea03c2d5b Warning fixes. diff -r 09165461996f -r ec946cb74397 avcodec.h --- a/avcodec.h Thu May 15 00:43:43 2003 +0000 +++ b/avcodec.h Thu May 15 01:34:47 2003 +0000 @@ -314,7 +314,7 @@ * type of the buffer (to keep track of who has to dealloc data[*])\ * - encoding: set by the one who allocs it\ * - decoding: set by the one who allocs it\ - * Note: user allocated (direct rendering) & internal buffers can not coexist currently\ + * Note: user allocated (direct rendering) & internal buffers can not coexist currently\ */\ int type;\ \ diff -r 09165461996f -r ec946cb74397 h264.c --- a/h264.c Thu May 15 00:43:43 2003 +0000 +++ b/h264.c Thu May 15 01:34:47 2003 +0000 @@ -2563,7 +2563,7 @@ for(i=0; ishort_ref_count; i++){ Picture *pic= h->short_ref[i]; if(s->avctx->debug&FF_DEBUG_MMCO) - printf("%d %d %X\n", i, pic->frame_num, (int)pic); + printf("%d %d %p\n", i, pic->frame_num, pic); if(pic->frame_num == frame_num){ h->short_ref[i]= NULL; memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); diff -r 09165461996f -r ec946cb74397 mjpeg.c --- a/mjpeg.c Thu May 15 00:43:43 2003 +0000 +++ b/mjpeg.c Thu May 15 01:34:47 2003 +0000 @@ -478,7 +478,7 @@ int size= get_bit_count(&s->pb) - start*8; int i, ff_count; uint8_t *buf= s->pb.buf + start; - int align= (-(int)(buf))&3; + int align= (-(size_t)(buf))&3; assert((size&7) == 0); size >>= 3; diff -r 09165461996f -r ec946cb74397 motion_est_template.c --- a/motion_est_template.c Thu May 15 00:43:43 2003 +0000 +++ b/motion_est_template.c Thu May 15 01:34:47 2003 +0000 @@ -43,8 +43,8 @@ op_pixels_func (*chroma_hpel_put)[4];\ qpel_mc_func (*qpel_put)[16];\ qpel_mc_func (*qpel_avg)[16]= &s->dsp.avg_qpel_pixels_tab[size];\ - const __attribute__((unused)) int unu= time_pp + time_pb + (int)src_u + (int)src_v + (int)ref_u + (int)ref_v\ - + (int)ref2_y + (int)hpel_avg + (int)qpel_avg + (int)score_map;\ + const __attribute__((unused)) int unu= time_pp + time_pb + (size_t)src_u + (size_t)src_v + (size_t)ref_u + (size_t)ref_v\ + + (size_t)ref2_y + (size_t)hpel_avg + (size_t)qpel_avg + (size_t)score_map;\ if(s->no_rounding /*FIXME b_type*/){\ hpel_put= &s->dsp.put_no_rnd_pixels_tab[size];\ chroma_hpel_put= &s->dsp.put_no_rnd_pixels_tab[size+1];\ diff -r 09165461996f -r ec946cb74397 raw.c --- a/raw.c Thu May 15 00:43:43 2003 +0000 +++ b/raw.c Thu May 15 01:34:47 2003 +0000 @@ -141,7 +141,7 @@ static int raw_init_encoder(AVCodecContext *avctx) { - avctx->coded_frame = (AVPicture*)avctx->priv_data; + avctx->coded_frame = (AVFrame *)avctx->priv_data; avctx->coded_frame->pict_type = FF_I_TYPE; avctx->coded_frame->key_frame = 1; avctx->codec_tag = findFourCC(avctx->pix_fmt);