Warning fixes.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1884 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/ffmpeg.c b/ffmpeg.c
index bf88d24b15a3dd7b65304b324bfe31e42ef148f8..1f32637f2ea0b886d2511a043ae6a8fbab7b2219 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -680,7 +680,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
         avg_bitrate = (double)(total_size * 8) / ti1 / 1000.0;
         fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
             (double)total_size / 1024, ti1, bitrate, avg_bitrate);
-        fprintf(fvstats,"type= %s\n", av_get_pict_type_char(enc->coded_frame->pict_type));        
+        fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type));        
     }
 }
 

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e17cbe6e01ed4d3c5c8cb5cce5509efc2d446545..ef92e3cbbf6622ad75f06ed7eb05b5dc711cc471 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -314,7 +314,7 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG,
      * 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 --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6877e2f0b42faca4e99ba329411fd6778363f9e2..62550f9f3786b164000974e3dec6a4fc5312efa5 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2563,7 +2563,7 @@ static Picture * remove_short(H264Context *h, int frame_num){
     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*));

diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 135066796fd76104b3eb8b252f2cff46a4796d39..58cf89fc33bf6c0059a3df0b558fef55309e8d92 100644 (file)
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -478,7 +478,7 @@ static void escape_FF(MpegEncContext *s, int start)
     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 --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 2d403993cd245f0e2744166dabd8af9e22cbd805..546509e53180ea9118bfa7e0e8246ca2154d6ffc 100644 (file)
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -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 --git a/libavcodec/raw.c b/libavcodec/raw.c
index 8c38b8e8c1e943b0b60f5ca960423df6399ff349..ee4b6fdc66d47a33ba60c7f1a6e095491efb614f 100644 (file)
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -141,7 +141,7 @@ static int raw_close_decoder(AVCodecContext *avctx)
 
 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);