Mercurial > libavcodec.hg
changeset 2962:fde28cb7e3d5 libavcodec
use PRIxN, %zd, %td formats where needed
| author | mru |
|---|---|
| date | Mon, 12 Dec 2005 01:56:46 +0000 |
| parents | dc544c0e6220 |
| children | c8fa6a50fca5 |
| files | 4xm.c dvdsubenc.c h263.c h264.c huffyuv.c interplayvideo.c mpegvideo.c opt.c vorbis.c |
| diffstat | 9 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/4xm.c Mon Dec 12 01:42:06 2005 +0000 +++ b/4xm.c Mon Dec 12 01:56:46 2005 +0000 @@ -355,7 +355,7 @@ } 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))
--- a/dvdsubenc.c Mon Dec 12 01:42:06 2005 +0000 +++ b/dvdsubenc.c Mon Dec 12 01:56:46 2005 +0000 @@ -208,7 +208,7 @@ 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; }
--- a/h263.c Mon Dec 12 01:42:06 2005 +0000 +++ b/h263.c Mon Dec 12 01:56:46 2005 +0000 @@ -5861,7 +5861,7 @@ 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");
--- a/h264.c Mon Dec 12 01:42:06 2005 +0000 +++ b/h264.c Mon Dec 12 01:56:46 2005 +0000 @@ -398,7 +398,7 @@ 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){
--- a/huffyuv.c Mon Dec 12 01:42:06 2005 +0000 +++ b/huffyuv.c Mon Dec 12 01:56:46 2005 +0000 @@ -1188,7 +1188,7 @@ 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; }
--- a/interplayvideo.c Mon Dec 12 01:42:06 2005 +0000 +++ b/interplayvideo.c Mon Dec 12 01:56:46 2005 +0000 @@ -846,7 +846,7 @@ } 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); } }
--- a/mpegvideo.c Mon Dec 12 01:42:06 2005 +0000 +++ b/mpegvideo.c Mon Dec 12 01:56:46 2005 +0000 @@ -2020,7 +2020,7 @@ 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 @@ 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; }
--- a/opt.c Mon Dec 12 01:42:06 2005 +0000 +++ b/opt.c Mon Dec 12 01:56:46 2005 +0000 @@ -181,7 +181,7 @@ 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;
--- a/vorbis.c Mon Dec 12 01:42:06 2005 +0000 +++ b/vorbis.c Mon Dec 12 01:56:46 2005 +0000 @@ -208,18 +208,18 @@ 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; }