Mercurial > mplayer.hg
changeset 32352:76f94c00a69f
1000l, %lf is not valid format string for printf (only for scanf) and actually
breaks on Windows. Fix all occurences.
Fixes bug 1810.
| author | reimar |
|---|---|
| date | Mon, 04 Oct 2010 06:40:32 +0000 |
| parents | 7727a2450505 |
| children | a5ed4bcb1149 |
| files | command.c help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-nl.h help/help_mp-pl.h help/help_mp-ru.h help/help_mp-sv.h help/help_mp-tr.h help/help_mp-zh_CN.h help/help_mp-zh_TW.h libmpcodecs/ad_liba52.c libmpdemux/demux_mpg.c libmpdemux/muxer_mpeg.c libvo/font_load_ft.c loader/win32.c mplayer.c stream/tvi_v4l.c stream/tvi_v4l2.c |
| diffstat | 24 files changed, 56 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/command.c Sun Oct 03 20:49:50 2010 +0000 +++ b/command.c Mon Oct 04 06:40:32 2010 +0000 @@ -93,7 +93,7 @@ *dy = (double) iy / (double) vo_dheight; mp_msg(MSGT_CPLAYER, MSGL_V, - "\r\nrescaled coordinates: %.3lf, %.3lf, screen (%d x %d), vodisplay: (%d, %d), fullscreen: %d\r\n", + "\r\nrescaled coordinates: %.3f, %.3f, screen (%d x %d), vodisplay: (%d, %d), fullscreen: %d\r\n", *dx, *dy, vo_screenwidth, vo_screenheight, vo_dwidth, vo_dheight, vo_fs); } @@ -3108,7 +3108,7 @@ break; case MP_CMD_GET_TIME_LENGTH:{ - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_LENGTH=%.2lf\n", + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ANS_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer)); } break;
--- a/help/help_mp-bg.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-bg.h Mon Oct 04 06:40:32 2010 +0000 @@ -960,7 +960,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams се провали: %s\nНе може да се зададе разчитаната честота.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE не се възприема от посоченото устройство.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams се провали: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: честотата на дискретизация е %lf (разчитаната честота е %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: честотата на дискретизация е %f (разчитаната честота е %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Не може да бъде отворен аудио канал: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-cs.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-cs.h Mon Oct 04 06:40:32 2010 +0000 @@ -1198,7 +1198,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: selhalo setparams: %s\nNelze nastavit požadované vzorkování.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE nebyl přijat daným zdrojem.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: selhalo getparams: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: vzorkování je nyní %lf (požadovaný kmitočet je %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: vzorkování je nyní %f (požadovaný kmitočet je %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Nelze otevřít zvukový kanál: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-de.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-de.h Mon Oct 04 06:40:32 2010 +0000 @@ -1178,7 +1178,7 @@ " Konnte gewünschte Samplerate nicht setzen.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE wurde von der angegebenen Ressource nicht akzeptiert.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams fehlgeschlagen: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: Samplerate ist jetzt %lf (gewünschte Rate ist %lf).\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: Samplerate ist jetzt %f (gewünschte Rate ist %f).\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Konnte Audiokanal nicht öffnen: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-en.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-en.h Mon Oct 04 06:40:32 2010 +0000 @@ -1207,7 +1207,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams failed: %s\nCould not set desired samplerate.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE was not accepted on the given resource.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams failed: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate is now %lf (desired rate is %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate is now %f (desired rate is %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Unable to open audio channel: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-es.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-es.h Mon Oct 04 06:40:32 2010 +0000 @@ -1209,7 +1209,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: fallo en setparams: %s\nImposble configurar samplerate deseado.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE No fue aceptado en el recurso dado.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: fallo en getparams: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate es ahora %lf (el deseado es %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate es ahora %f (el deseado es %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Imposible abrir canal de audio: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-fr.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-fr.h Mon Oct 04 06:40:32 2010 +0000 @@ -1137,7 +1137,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] Init : échec setparams: %s\nImpossible régler échantillonnage désiré.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] Init : AL_RATE non acceptée sur la ressource donnée.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] Init : échec getparams : %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] Init : échantillonnage maintenant %lf (taux désiré : %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] Init : échantillonnage maintenant %f (taux désiré : %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] Init : %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] Init : Impossible d'ouvrir canal audio : %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] Desinit : ...\n"
--- a/help/help_mp-hu.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-hu.h Mon Oct 04 06:40:32 2010 +0000 @@ -1207,7 +1207,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams sikertelen: %s\nNem sikerült beállítani az előírt samplerate-et.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE-et nem fogadta el a kiválasztott erőforrás.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams sikertelen: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate most már %lf (előírt ráta: %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate most már %f (előírt ráta: %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Nem tudom megnyitni az audio csatornát: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-it.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-it.h Mon Oct 04 06:40:32 2010 +0000 @@ -1200,7 +1200,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams fallito: %s\nNon posso impostare il samplerate voluto.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE non è stato accettato dalla risorsa.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams fallito: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: il samplerate ora è %lf (la frequenza voluta è %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: il samplerate ora è %f (la frequenza voluta è %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Non posso apire il canale audio: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-nl.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-nl.h Mon Oct 04 06:40:32 2010 +0000 @@ -884,7 +884,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams gefaald: %s\nKon de gewenste samplerate niet instellen.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: de AL_RATE werd niet geaccepteerd.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams gefaald: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: de samplerate is nu %lf (de gewenste bitrate is %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: de samplerate is nu %f (de gewenste bitrate is %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Kan het audio kanaal niet openen: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-pl.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-pl.h Mon Oct 04 06:40:32 2010 +0000 @@ -1103,7 +1103,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparms nie powiodło się %s\nNie udało sie ustawić wybranej częstotliwości próbkowania.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE nie został zakceptowany przy podanym źródle.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams nie powiodło się: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: częstotliwość próbkowania: %lf (wymagana skala %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: częstotliwość próbkowania: %f (wymagana skala %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Nie udało się otworzyć kanału dźwięku: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n"
--- a/help/help_mp-ru.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-ru.h Mon Oct 04 06:40:32 2010 +0000 @@ -1199,7 +1199,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] инициализация: ошибка установки параметров: %s\nНе могу установить требуемую частоту дискретизации.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] инициализация: AL_RATE не доступен на заданном ресурсе.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] инициализация: ошибка получения параметров: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] инициализация: частота дискретизации теперь %lf (требуемая частота %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] инициализация: частота дискретизации теперь %f (требуемая частота %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] инициализация: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] инициализация: Не могу открыть канал аудио: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] деинициализация: ...\n"
--- a/help/help_mp-sv.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-sv.h Mon Oct 04 06:40:32 2010 +0000 @@ -904,7 +904,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams misslyckades: %s\nKunde inte sätta önskad samplerate.\n" // -''- #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE var inte accepterad på given resurs.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams misslyckades: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate är nu %lf (önskad rate var %lf)\n" // -''- also rate? +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: samplerate är nu %f (önskad rate var %f)\n" // -''- also rate? #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Oförmögen att öppna audiokanal: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n" // FIXME translate?
--- a/help/help_mp-tr.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-tr.h Mon Oct 04 06:40:32 2010 +0000 @@ -1151,7 +1151,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] açılış: setparams başarısız: %s\nİstenen örnekleme oranı ayarlanamadı.\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] açılış: Verilen kaynakta AL_RATE onaylanmadı.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] açılış: getparams başarısız: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] açılış: örnekleme oranı şu anda %lf (istenen oran %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] açılış: örnekleme oranı şu anda %f (istenen oran %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] açılış: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] açılış: Ses kanalı açılamıyor: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] kapanış: ...\n"
--- a/help/help_mp-zh_CN.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-zh_CN.h Mon Oct 04 06:40:32 2010 +0000 @@ -1189,7 +1189,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] 初始设置：setparams 失败：%s\n无法设置为所需的采样率。\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] 初始设置：AL_RATE 不适用于给定的音频来源。\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] 初始设置：getparams 失败：%s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] 初始设置：当前的采样率为 %lf（所需的速率为 %lf）\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] 初始设置：当前的采样率为 %f（所需的速率为 %f）\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] 初始设置：%s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] 初始设置：无法打开音频声道：%s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] 卸载：...\n"
--- a/help/help_mp-zh_TW.h Sun Oct 03 20:49:50 2010 +0000 +++ b/help/help_mp-zh_TW.h Mon Oct 04 06:40:32 2010 +0000 @@ -1122,7 +1122,7 @@ #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] 初始: 設定參數失敗: %s\n不能設定需要的采様率。\n" #define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] 初始: AL_RATE 在給定的源上不能用。\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] 初始: 獲取參數失敗: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] 初始: 當前的采様率為 %lf (需要的速率是 %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] 初始: 當前的采様率為 %f (需要的速率是 %f)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] 初始: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] 初始: 無法打開音頻通道: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] 反初始: ...\n"
--- a/libmpcodecs/ad_liba52.c Sun Oct 03 20:49:50 2010 +0000 +++ b/libmpcodecs/ad_liba52.c Mon Oct 04 06:40:32 2010 +0000 @@ -135,7 +135,7 @@ static sample_t dynrng_call (sample_t c, void *data) { -// fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, (double)drc_level, (double)pow((double)c, drc_level)); +// fprintf(stderr, "(%f, %f): %f\n", (double)c, (double)drc_level, (double)pow((double)c, drc_level)); return pow((double)c, drc_level); }
--- a/libmpdemux/demux_mpg.c Sun Oct 03 20:49:50 2010 +0000 +++ b/libmpdemux/demux_mpg.c Mon Oct 04 06:40:32 2010 +0000 @@ -1015,7 +1015,7 @@ switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg) != STREAM_UNSUPPORTED) { - mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, (%.3lf)\r\n", *((double*)arg)); + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, (%.3f)\r\n", *((double*)arg)); return DEMUXER_CTRL_GUESS; } if (mpg_d && mpg_d->has_valid_timestamps) {
--- a/libmpdemux/muxer_mpeg.c Sun Oct 03 20:49:50 2010 +0000 +++ b/libmpdemux/muxer_mpeg.c Mon Oct 04 06:40:32 2010 +0000 @@ -1222,9 +1222,9 @@ if(spriv->dts || spriv->pts) { if((spriv->dts && priv->scr >= spriv->dts) || priv->scr >= spriv->pts) - mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nERROR: scr %.3lf, dts %.3lf, pts %.3lf\r\n", (double) priv->scr/27000000.0, (double) spriv->dts/27000000.0, (double) spriv->pts/27000000.0); + mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nERROR: scr %.3f, dts %.3f, pts %.3f\r\n", (double) priv->scr/27000000.0, (double) spriv->dts/27000000.0, (double) spriv->pts/27000000.0); else if(priv->scr + 63000*300 < spriv->dts) - mp_msg(MSGT_MUXER, MSGL_INFO, "\r\nWARNING>: scr %.3lf, dts %.3lf, pts %.3lf, diff %.3lf, piff %.3lf\r\n", (double) priv->scr/27000000.0, (double) spriv->dts/27000000.0, (double) spriv->pts/27000000.0, (double)(spriv->dts - priv->scr)/27000000.0, (double)(spriv->pts - priv->scr)/27000000.0); + mp_msg(MSGT_MUXER, MSGL_INFO, "\r\nWARNING>: scr %.3f, dts %.3f, pts %.3f, diff %.3f, piff %.3f\r\n", (double) priv->scr/27000000.0, (double) spriv->dts/27000000.0, (double) spriv->pts/27000000.0, (double)(spriv->dts - priv->scr)/27000000.0, (double)(spriv->pts - priv->scr)/27000000.0); } n = 0; @@ -1419,7 +1419,7 @@ mindts = spriv->framebuf[0].dts; } - mp_msg(MSGT_MUXER, MSGL_DBG2, "UPDATE SCR TO %"PRIu64" (%.3lf)\n", priv->scr, (double) (priv->scr/27000000.0)); + mp_msg(MSGT_MUXER, MSGL_DBG2, "UPDATE SCR TO %"PRIu64" (%.3f)\n", priv->scr, (double) (priv->scr/27000000.0)); for(i = 0; i < muxer->avih.dwStreams; i++) { @@ -1467,9 +1467,9 @@ mp_msg(MSGT_MUXER, MSGL_DBG2, "\n"); while(n < vpriv->framebuf_used) { - mp_msg(MSGT_MUXER, MSGL_DBG2, "CALC_FRAMES, n=%d, type=%c, pts=%.3lf\n", n, FTYPE(vpriv->framebuf[n].type), (double)vpriv->framebuf[n].pts/27000000.0f); + mp_msg(MSGT_MUXER, MSGL_DBG2, "CALC_FRAMES, n=%d, type=%c, pts=%.3f\n", n, FTYPE(vpriv->framebuf[n].type), (double)vpriv->framebuf[n].pts/27000000.0f); if(n+1 < vpriv->framebuf_used) - mp_msg(MSGT_MUXER, MSGL_DBG2, "n+1=%d, type=%c, pts=%.3lf\n", n+1, FTYPE(vpriv->framebuf[n+1].type), (double)vpriv->framebuf[n+1].pts/27000000.0f); + mp_msg(MSGT_MUXER, MSGL_DBG2, "n+1=%d, type=%c, pts=%.3f\n", n+1, FTYPE(vpriv->framebuf[n+1].type), (double)vpriv->framebuf[n+1].pts/27000000.0f); if(vpriv->framebuf[n].type == I_FRAME) { @@ -1567,7 +1567,7 @@ apriv->framebuf[i].dts += init_delay; } apriv->last_pts += init_delay; - mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nINITIAL VIDEO DELAY: %.3lf, currAPTS: %.3lf\r\n", (double) init_delay/27000000.0f, (double) apriv->last_pts/27000000.0f); + mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nINITIAL VIDEO DELAY: %.3f, currAPTS: %.3f\r\n", (double) init_delay/27000000.0f, (double) apriv->last_pts/27000000.0f); } if((priv->is_xvcd || priv->is_xsvcd) && (vpriv->size == 0)) @@ -1684,7 +1684,7 @@ //the 2 lines below are needed to handle non-standard frame rates (such as 18) if(! spriv->delta_pts) spriv->delta_pts = spriv->nom_delta_pts = (uint64_t) ((double)27000000.0 * spriv->delta_clock ); - mp_msg(MSGT_MUXER, MSGL_DBG2, "\nFPS: %.3f, FRAMETIME: %.3lf\n", fps, (double)1/fps); + mp_msg(MSGT_MUXER, MSGL_DBG2, "\nFPS: %.3f, FRAMETIME: %.3f\n", fps, (double)1/fps); if(priv->patch_seq) patch_seq(priv, &(s->buffer[i])); } @@ -1782,7 +1782,7 @@ mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG12: add_frames(%zd) failed, exit\r\n", len); return 0; } - mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nVIDEO FRAME, PT: %C, tr: %d, diff: %d, dts: %.3lf, pts: %.3lf, pdt: %u, gop_reset: %d\r\n", + mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nVIDEO FRAME, PT: %C, tr: %d, diff: %d, dts: %.3f, pts: %.3f, pdt: %u, gop_reset: %d\r\n", ftypes[pt], temp_ref, frames_diff, ((double) spriv->last_dts/27000000.0f), ((double) spriv->last_pts/27000000.0f), spriv->picture.display_time, gop_reset); @@ -1803,7 +1803,7 @@ adj++; } } - mp_msg(MSGT_MUXER, MSGL_V, "\r\nResynced B-frame by %d units, DIFF: %"PRId64" (%.3lf),[pd]ts=%.3lf\r\n", + mp_msg(MSGT_MUXER, MSGL_V, "\r\nResynced B-frame by %d units, DIFF: %"PRId64" (%.3f),[pd]ts=%.3f\r\n", n, diff, (double) diff/27000000.0f, (double) spriv->last_pts/27000000.0f); spriv->last_pts = spriv->last_dts; } @@ -1848,7 +1848,7 @@ { vpriv->framebuf[i].pts += diff; vpriv->framebuf[i].dts += i * diff; - mp_msg(MSGT_MUXER, MSGL_DBG2, "FIXED_PTS: %.3lf, FIXED_DTS: %.3lf\n", + mp_msg(MSGT_MUXER, MSGL_DBG2, "FIXED_PTS: %.3f, FIXED_DTS: %.3f\n", (double) (vpriv->framebuf[i].pts/27000000.0), (double) (vpriv->framebuf[i].dts/27000000.0)); } return diff; @@ -1904,7 +1904,7 @@ //warning, it seems that packed bops can lead to delta == 0 pt = vpriv->picture.picture_type + 1; - mp_msg(MSGT_MUXER, MSGL_DBG2, "\nTYPE: %c, RESOLUTION: %d, TEMP: %d, delta: %d, delta_pts: %"PRId64" = %.3lf, delta2: %.3lf\n", + mp_msg(MSGT_MUXER, MSGL_DBG2, "\nTYPE: %c, RESOLUTION: %d, TEMP: %d, delta: %d, delta_pts: %"PRId64" = %.3f, delta2: %.3f\n", FTYPE(pt), vpriv->picture.timeinc_resolution, vpriv->picture.timeinc_unit, delta, delta_pts, (double) (delta_pts/27000000.0), (double) delta / (double) vpriv->picture.timeinc_resolution); @@ -1937,13 +1937,13 @@ vpriv->last_pts += vpriv->frame_duration; vpriv->last_dts = vpriv->framebuf[vpriv->framebuf_used-1].dts; vpriv->delta_clock = ((double) vpriv->frame_duration)/27000000.0; - mp_msg(MSGT_MUXER, MSGL_INFO, "FRAME DURATION: %"PRIu64" %.3lf\n", + mp_msg(MSGT_MUXER, MSGL_INFO, "FRAME DURATION: %"PRIu64" %.3f\n", vpriv->frame_duration, (double) (vpriv->frame_duration/27000000.0)); vpriv->is_ready = 1; } } - mp_msg(MSGT_MUXER, MSGL_DBG2, "LAST_PTS: %.3lf, LAST_DTS: %.3lf\n", + mp_msg(MSGT_MUXER, MSGL_DBG2, "LAST_PTS: %.3f, LAST_DTS: %.3f\n", (double) (vpriv->last_pts/27000000.0), (double) (vpriv->last_dts/27000000.0)); vpriv->vframes++; @@ -2303,7 +2303,7 @@ if(! spriv->vframes) { spriv->last_dts = spriv->last_pts - (uint64_t)(27000000.0f/fps); - mp_msg(MSGT_MUXER, MSGL_INFO,"INITV: %.3lf, %.3lf, fps: %.3f\r\n", (double) spriv->last_pts/27000000.0f, (double) spriv->last_dts/27000000.0f, fps); + mp_msg(MSGT_MUXER, MSGL_INFO,"INITV: %.3f, %.3f, fps: %.3f\r\n", (double) spriv->last_pts/27000000.0f, (double) spriv->last_dts/27000000.0f, fps); } if(is_mpeg1(stream_format) || is_mpeg2(stream_format)) @@ -2377,7 +2377,7 @@ parse_audio(s, 0, &nf, &fake_timer, priv->init_adelay, priv->drop); spriv->vframes += nf; if(! spriv->vframes) - mp_msg(MSGT_MUXER, MSGL_INFO, "AINIT: %.3lf\r\n", (double) spriv->last_pts/27000000.0f); + mp_msg(MSGT_MUXER, MSGL_INFO, "AINIT: %.3f\r\n", (double) spriv->last_pts/27000000.0f); } } @@ -2406,7 +2406,7 @@ write_mpeg_pack(muxer, NULL, muxer->stream, 1); //insert fake Nav Packet } - mp_msg(MSGT_MUXER, MSGL_INFO, "\nOverhead: %.3lf%% (%"PRIu64" / %"PRIu64")\n", 100.0 * (double)priv->headers_size / (double)priv->data_size, priv->headers_size, priv->data_size); + mp_msg(MSGT_MUXER, MSGL_INFO, "\nOverhead: %.3f%% (%"PRIu64" / %"PRIu64")\n", 100.0 * (double)priv->headers_size / (double)priv->data_size, priv->headers_size, priv->data_size); } static void mpegfile_write_header(muxer_t *muxer)
--- a/libvo/font_load_ft.c Sun Oct 03 20:49:50 2010 +0000 +++ b/libvo/font_load_ft.c Mon Oct 04 06:40:32 2010 +0000 @@ -202,8 +202,8 @@ } desc->glyph_index[unicode?character:code] = glyph_index; } -// fprintf(stderr, "font height: %lf\n", (double)(face->bbox.yMax-face->bbox.yMin)/(double)face->units_per_EM*ppem); -// fprintf(stderr, "font width: %lf\n", (double)(face->bbox.xMax-face->bbox.xMin)/(double)face->units_per_EM*ppem); +// fprintf(stderr, "font height: %f\n", (double)(face->bbox.yMax-face->bbox.yMin)/(double)face->units_per_EM*ppem); +// fprintf(stderr, "font width: %f\n", (double)(face->bbox.xMax-face->bbox.xMin)/(double)face->units_per_EM*ppem); ymax = (double)(face->bbox.yMax)/(double)face->units_per_EM*ppem+1; ymin = (double)(face->bbox.yMin)/(double)face->units_per_EM*ppem-1; @@ -593,13 +593,13 @@ desc->tables.omt, desc->tables.o_r, desc->tables.o_w, desc->tables.o_size); } -// fprintf(stderr, "fg: outline t = %lf\n", GetTimer()-t); +// fprintf(stderr, "fg: outline t = %f\n", GetTimer()-t); if (desc->tables.g_r) { blur(abuffer+off, desc->tables.tmp, width, height, stride, desc->tables.gt2, desc->tables.g_r, desc->tables.g_w); -// fprintf(stderr, "fg: blur t = %lf\n", GetTimer()-t); +// fprintf(stderr, "fg: blur t = %f\n", GetTimer()-t); } resample_alpha(abuffer+off, bbuffer+off, width, height, stride, font_factor); @@ -638,9 +638,9 @@ // ttime = GetTimer(); err = check_font(desc, ppem, padding, pic_idx, charset_size, charset, charcodes, unicode); // ttime=GetTimer()-ttime; -// printf("render: %7lf us\n",ttime); +// printf("render: %7f us\n",ttime); if (err) return -1; -// fprintf(stderr, "fg: render t = %lf\n", GetTimer()-t); +// fprintf(stderr, "fg: render t = %f\n", GetTimer()-t); desc->pic_a[pic_idx]->w = desc->pic_b[pic_idx]->w; desc->pic_a[pic_idx]->h = desc->pic_b[pic_idx]->h; @@ -1024,7 +1024,7 @@ goto err_out; #endif -// fprintf(stderr, "fg: prepare t = %lf\n", GetTimer()-t); +// fprintf(stderr, "fg: prepare t = %f\n", GetTimer()-t); err = prepare_font(desc, face, subtitle_font_ppem, desc->face_cnt-1, charset_size, my_charset, my_charcodes, unicode,
--- a/loader/win32.c Sun Oct 03 20:49:50 2010 +0000 +++ b/loader/win32.c Mon Oct 04 06:40:32 2010 +0000 @@ -4553,7 +4553,7 @@ { FPU_DOUBLES(x,y); - dbgprintf("_CIpow(%lf, %lf)\n", x, y); + dbgprintf("_CIpow(%f, %f)\n", x, y); return pow(x, y); } @@ -5008,7 +5008,7 @@ static double expfloor(double x) { - dbgprintf("floor(%lf)\n", x); + dbgprintf("floor(%f)\n", x); return floor(x); } @@ -5019,7 +5019,7 @@ { FPU_DOUBLE(x); - dbgprintf("_CIcos(%lf)\n", x); + dbgprintf("_CIcos(%f)\n", x); return cos(x); } @@ -5027,7 +5027,7 @@ { FPU_DOUBLE(x); - dbgprintf("_CIsin(%lf)\n", x); + dbgprintf("_CIsin(%f)\n", x); return sin(x); } @@ -5035,7 +5035,7 @@ { FPU_DOUBLE(x); - dbgprintf("_CIsqrt(%lf)\n", x); + dbgprintf("_CIsqrt(%f)\n", x); return sqrt(x); }
--- a/mplayer.c Sun Oct 03 20:49:50 2010 +0000 +++ b/mplayer.c Mon Oct 04 06:40:32 2010 +0000 @@ -582,10 +582,10 @@ start_pts = video_start_pts; } if (start_pts != MP_NOPTS_VALUE) - mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=%.2lf\n", start_pts); + mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=%.2f\n", start_pts); else mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_START_TIME=unknown\n"); - mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(mpctx->demuxer)); + mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer)); mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_SEEKABLE=%d\n", mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable)); if (mpctx->demuxer) {
--- a/stream/tvi_v4l.c Sun Oct 03 20:49:50 2010 +0000 +++ b/stream/tvi_v4l.c Mon Oct 04 06:40:32 2010 +0000 @@ -1673,7 +1673,7 @@ mp_msg(MSGT_TV, MSGL_V, "\nvideo capture thread: frame delta = 0\n"); } else if ((interval - prev_interval < (long long)0.85e6/priv->fps) || (interval - prev_interval > (long long)1.15e6/priv->fps) ) { - mp_msg(MSGT_TV, MSGL_V, "\nvideo capture thread: frame delta ~ %.1lf fps\n", + mp_msg(MSGT_TV, MSGL_V, "\nvideo capture thread: frame delta ~ %.1f fps\n", (double)1e6/(interval - prev_interval)); } } @@ -1702,7 +1702,7 @@ priv->video_interval_sum += orig_interval-prev_interval; if (priv->video_avg_ptr >= VIDEO_AVG_BUFFER_SIZE) priv->video_avg_ptr = 0; -// fprintf(stderr, "fps: %lf\n", (double)1e6*VIDEO_AVG_BUFFER_SIZE/priv->video_interval_sum); +// fprintf(stderr, "fps: %f\n", (double)1e6*VIDEO_AVG_BUFFER_SIZE/priv->video_interval_sum); // interpolate the skew in time pthread_mutex_lock(&priv->skew_mutex); @@ -1718,7 +1718,7 @@ } } - mp_msg(MSGT_TV, MSGL_DBG3, "\nfps = %lf, interval = %lf, a_skew = %f, corr_skew = %f\n", + mp_msg(MSGT_TV, MSGL_DBG3, "\nfps = %f, interval = %f, a_skew = %f, corr_skew = %f\n", (interval != prev_interval) ? (double)1e6/(interval - prev_interval) : -1, (double)1e-6*interval, (double)1e-6*xskew, (double)1e-6*skew); mp_msg(MSGT_TV, MSGL_DBG3, "vcnt = %d, acnt = %d\n", priv->video_cnt, priv->audio_cnt);
--- a/stream/tvi_v4l2.c Sun Oct 03 20:49:50 2010 +0000 +++ b/stream/tvi_v4l2.c Mon Oct 04 06:40:32 2010 +0000 @@ -1693,7 +1693,7 @@ if (!priv->tv_param->noaudio) pthread_mutex_unlock(&priv->skew_mutex); } priv->curr_frame = (long long)buf.timestamp.tv_sec*1e6+buf.timestamp.tv_usec; -// fprintf(stderr, "idx = %d, ts = %lf\n", buf.index, (double)(priv->curr_frame) / 1e6); +// fprintf(stderr, "idx = %d, ts = %f\n", buf.index, (double)(priv->curr_frame) / 1e6); interval = priv->curr_frame - priv->first_frame; delta = interval - prev_interval; @@ -1713,7 +1713,7 @@ } } - mp_msg(MSGT_TV, MSGL_DBG3, "\nfps = %lf, interval = %lf, a_skew = %f, corr_skew = %f\n", + mp_msg(MSGT_TV, MSGL_DBG3, "\nfps = %f, interval = %f, a_skew = %f, corr_skew = %f\n", delta ? (double)1e6/delta : -1, (double)1e-6*interval, (double)1e-6*xskew, (double)1e-6*skew); mp_msg(MSGT_TV, MSGL_DBG3, "vcnt = %d, acnt = %d\n", priv->video_cnt, priv->audio_cnt); @@ -1886,7 +1886,7 @@ priv->audio_start_time = start_time_avg/(priv->audio_recv_blocks_total+1); } -// fprintf(stderr, "spb = %lf, bs = %d, skew = %lf\n", priv->audio_secs_per_block, priv->audio_in.blocksize, +// fprintf(stderr, "spb = %f, bs = %d, skew = %f\n", priv->audio_secs_per_block, priv->audio_in.blocksize, // (double)(current_time - 1e6*priv->audio_secs_per_block*priv->audio_recv_blocks_total)/1e6); // put the current skew into the ring buffer @@ -1938,7 +1938,7 @@ priv->audio_skew += priv->audio_start_time - priv->first_frame; pthread_mutex_unlock(&priv->skew_mutex); -// fprintf(stderr, "audio_skew = %lf, delta = %lf\n", (double)priv->audio_skew/1e6, (double)priv->audio_skew_delta_total/1e6); +// fprintf(stderr, "audio_skew = %f, delta = %f\n", (double)priv->audio_skew/1e6, (double)priv->audio_skew_delta_total/1e6); pthread_mutex_lock(&priv->audio_mutex); if ((priv->audio_tail+1) % priv->audio_buffer_size == priv->audio_head) {