Mercurial > libavcodec.hg

changeset 1266:ec946cb74397 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Warning fixes.
author mellum
date Thu, 15 May 2003 01:34:47 +0000
parents 09165461996f
children 85b71f9f7450
files avcodec.h h264.c mjpeg.c motion_est_template.c raw.c
diffstat 5 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;\
     \
--- 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; i<h->short_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*));
--- 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;
--- 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];\
--- 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);