diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-07 18:33:01 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-07 21:34:54 +0200 |
| commit | 5234c72e28c27e232a35ebcbadc50c5933cccf7d (patch) | |
| tree | c413ec85799e5b46fd6d64280f060e2571fc99a3 /mencoder.c | |
| parent | 2569c2e2bc1e91f520d887b723d3138107f119f3 (diff) | |
| download | mpv-5234c72e28c27e232a35ebcbadc50c5933cccf7d.tar.bz2 mpv-5234c72e28c27e232a35ebcbadc50c5933cccf7d.tar.xz | |
Restore collapsed whitespace in output messages
For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c index 908f9a80e4..25d1c77fbc 100644 --- a/mencoder.c +++ b/mencoder.c @@ -529,7 +529,7 @@ play_next_file: mencoder_exit(1,NULL); } - mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "success: format: %d data: 0x%X - 0x%x\n", file_format, (int)(stream->start_pos), (int)(stream->end_pos)); + mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "success: format: %d data: 0x%X - 0x%x\n", file_format, (int)(stream->start_pos), (int)(stream->end_pos)); #ifdef CONFIG_DVDREAD if(stream->type==STREAMTYPE_DVD){ @@ -607,7 +607,7 @@ sh_video=d_video->sh; mencoder_exit(1,NULL); } - mp_tmsg(MSGT_MENCODER,MSGL_INFO, "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n", + mp_tmsg(MSGT_MENCODER,MSGL_INFO, "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n", demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, sh_video->fps,sh_video->frametime ); @@ -1556,10 +1556,10 @@ if(out_video_codec==VCODEC_FRAMENO && mux_v->timer>100){ mp_tmsg(MSGT_MENCODER, MSGL_INFO, "Recommended video bitrate for %s CD: %d\n","2 x 800MB",(int)((2*800*1024*1024-muxer_f_size)/mux_v->timer/125)); } -mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nVideo stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs %d frames\n", +mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nVideo stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs %d frames\n", (float)(mux_v->size/mux_v->timer*8.0f/1000.0f), (int)(mux_v->size/mux_v->timer), (uint64_t)mux_v->size, (float)mux_v->timer, decoded_frameno); if(sh_audio) -mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nAudio stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs\n", +mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nAudio stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs\n", (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } |