use PRIxN, %zd, %td formats where needed

Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk

9 files changed, 12 insertions, 12 deletions

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 0b4b72faca..40e926d23d 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -355,7 +355,7 @@ static int decode_p_frame(FourXContext *f, uint8_t *buf, int length){
     }
     
     if(bitstream_size != (get_bits_count(&f->gb)+31)/32*4)
-        av_log(f->avctx, AV_LOG_ERROR, " %d %d %d bytes left\n", 
+        av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n", 
             bitstream_size - (get_bits_count(&f->gb)+31)/32*4, 
             bytestream_size - (f->bytestream - (buf + 20 + bitstream_size + wordstream_size)),
             wordstream_size - (((uint8_t*)f->wordstream) - (buf + 20 + bitstream_size))
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 632586c6d0..8f3d90d6d7 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -208,7 +208,7 @@ static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
     qq = outbuf;
     putbe16(&qq, q - outbuf);
     
-    av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%d\n", q - outbuf);
+    av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%td\n", q - outbuf);
     return q - outbuf;
 }
 
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 8d15461f6e..fa1a15954d 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -5861,7 +5861,7 @@ static int decode_vop_header(MpegEncContext *s, GetBitContext *gb){
     else
         s->current_picture_ptr->pts= AV_NOPTS_VALUE;
     if(s->avctx->debug&FF_DEBUG_PTS)
-        av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %Ld\n", s->current_picture_ptr->pts);
+        av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", s->current_picture_ptr->pts);
 
     check_marker(gb, "before vop_coded");
     
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d20f955498..e20d7bbb91 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -398,7 +398,7 @@ static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t v
     w      *= size;
     stride *= size;
     
-    assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
+    assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
     assert((stride&(w-1))==0);
 //FIXME check what gcc generates for 64 bit on x86 and possibly write a 32 bit ver of it
     if(w==2 && h==2){
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index ebb1340ac8..006d583116 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -1188,7 +1188,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         char *end= p + 1024*30;
         for(i=0; i<3; i++){
             for(j=0; j<256; j++){
-                snprintf(p, end-p, "%llu ", s->stats[i][j]);
+                snprintf(p, end-p, "%"PRIu64" ", s->stats[i][j]);
                 p+= strlen(p);
                 s->stats[i][j]= 0;
             }
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index f4add08c0d..dec7bc5f66 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -846,7 +846,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
     }
     if ((s->stream_ptr != s->stream_end) &&
         (s->stream_ptr + 1 != s->stream_end)) {
-        av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %d bytes left over\n",
+        av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n",
             s->stream_end - s->stream_ptr);
     }
 }
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index bfc894410a..cd244871a1 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2020,7 +2020,7 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
                 int64_t last= s->user_specified_pts;
             
                 if(time <= last){            
-                    av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%Ld, last=%Ld\n", pts, s->user_specified_pts);
+                    av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%"PRId64", last=%"PRId64"\n", pts, s->user_specified_pts);
                     return -1;
                 }
             }
@@ -2029,7 +2029,7 @@ static int load_input_picture(MpegEncContext *s, AVFrame *pic_arg){
             if(s->user_specified_pts != AV_NOPTS_VALUE){
                 s->user_specified_pts= 
                 pts= s->user_specified_pts + 1;
-                av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%Ld)\n", pts);
+                av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n", pts);
             }else{
                 pts= pic_arg->display_picture_number;
             }
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 9a3cd80eeb..e4fc2625a9 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -181,7 +181,7 @@ const char *av_get_string(void *obj, const char *name, AVOption **o_out, char *b
     switch(o->type){
     case FF_OPT_TYPE_FLAGS:     snprintf(buf, buf_len, "0x%08X",*(int    *)dst);break;
     case FF_OPT_TYPE_INT:       snprintf(buf, buf_len, "%d" , *(int    *)dst);break;
-    case FF_OPT_TYPE_INT64:     snprintf(buf, buf_len, "%Ld", *(int64_t*)dst);break;
+    case FF_OPT_TYPE_INT64:     snprintf(buf, buf_len, "%"PRId64, *(int64_t*)dst);break;
     case FF_OPT_TYPE_FLOAT:     snprintf(buf, buf_len, "%f" , *(float  *)dst);break;
     case FF_OPT_TYPE_DOUBLE:    snprintf(buf, buf_len, "%f" , *(double *)dst);break;
     case FF_OPT_TYPE_RATIONAL:  snprintf(buf, buf_len, "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break;
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 3cc81520ae..180380059d 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -208,18 +208,18 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) {
         AV_DEBUG(" %d. Codebook \n", cb);
 
         if (get_bits(gb, 24)!=0x564342) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %d. Codebook setup data corrupt. \n", cb);
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook setup data corrupt. \n", cb);
             goto error;
         }
 
         codebook_setup->dimensions=get_bits(gb, 16);
         if (codebook_setup->dimensions>16) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %d. Codebook's dimension is too large (%d). \n", cb, codebook_setup->dimensions);
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is too large (%d). \n", cb, codebook_setup->dimensions);
             goto error;
         }
         entries=get_bits(gb, 24);
         if (entries>V_MAX_VLCS) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %d. Codebook has too many entries (%d). \n", cb, entries);
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook has too many entries (%"PRIdFAST32"). \n", cb, entries);
             goto error;
         }