Mercurial > mplayer.hg
changeset 23637:df9aa9eb9de6
Use proper PRI?64 format strings
| author | reimar |
|---|---|
| date | Sun, 24 Jun 2007 14:54:56 +0000 |
| parents | 46a6e2183078 |
| children | a81e246e3b38 |
| files | libmpdemux/muxer_mpeg.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/muxer_mpeg.c Sun Jun 24 14:39:11 2007 +0000 +++ b/libmpdemux/muxer_mpeg.c Sun Jun 24 14:54:56 2007 +0000 @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> +#include <inttypes.h> #include <string.h> #include <sys/types.h> @@ -1256,7 +1257,7 @@ spriv->track_bufsize += len; if(spriv->track_bufsize > spriv->max_buffer_size) - mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nBUFFER OVERFLOW: %d > %d, pts: %llu\r\n", spriv->track_bufsize, spriv->max_buffer_size, spriv->pts); + mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nBUFFER OVERFLOW: %d > %d, pts: %"PRIu64"\r\n", spriv->track_bufsize, spriv->max_buffer_size, spriv->pts); if(s->type == MUXER_TYPE_AUDIO && s->wf->wFormatTag == AUDIO_A52) fix_a52_headers(s); @@ -1418,7 +1419,7 @@ muxer->sysrate = (muxer->sysrate * 11) / 10; //raise by 10% d = (double) priv->packet_size / (double)muxer->sysrate; priv->delta_scr = (uint64_t) (d * 27000000.0f); - mp_msg(MSGT_MUXER, MSGL_INFO, "\r\nBUFFER UNDEFLOW at stream %d, raising muxrate to %d kb/s, delta_scr: %llu\r\n", i, muxer->sysrate/125, priv->delta_scr); + mp_msg(MSGT_MUXER, MSGL_INFO, "\r\nBUFFER UNDEFLOW at stream %d, raising muxrate to %d kb/s, delta_scr: %"PRIu64"\r\n", i, muxer->sysrate/125, priv->delta_scr); spriv->track_bufsize = 0; } @@ -1781,7 +1782,7 @@ adj++; } } - mp_msg(MSGT_MUXER, MSGL_V, "\r\nResynced B-frame by %d units, DIFF: %lld (%.3lf),[pd]ts=%.3lf\r\n", + mp_msg(MSGT_MUXER, MSGL_V, "\r\nResynced B-frame by %d units, DIFF: %"PRId64" (%.3lf),[pd]ts=%.3lf\r\n", n, diff, (double) diff/27000000.0f, (double) spriv->last_pts/27000000.0f); spriv->last_pts = spriv->last_dts; } @@ -2011,7 +2012,7 @@ spriv->framebuf[idx].dts = dts; spriv->framebuf[idx].pts = pts; spriv->framebuf_used++; - mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nAdded frame, size: %u, idur: %llu, dts: %llu, pts: %llu, used: %u\r\n", len, idur, dts, pts, spriv->framebuf_used); + mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nAdded frame, size: %u, idur: %"PRIu64", dts: %"PRIu64", pts: %"PRIu64", used: %u\r\n", len, idur, dts, pts, spriv->framebuf_used); return idx; } @@ -2547,7 +2548,7 @@ if(conf_packet_size) priv->packet_size = conf_packet_size; priv->delta_scr = (uint64_t) (90000.0f*300.0f*(double)priv->packet_size/(double)priv->muxrate); - mp_msg(MSGT_MUXER, MSGL_INFO, "PACKET SIZE: %u bytes, deltascr: %llu\n", priv->packet_size, priv->delta_scr); + mp_msg(MSGT_MUXER, MSGL_INFO, "PACKET SIZE: %u bytes, deltascr: %"PRIu64"\n", priv->packet_size, priv->delta_scr); setup_sys_params(priv); if(conf_vaspect > 0)