diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
commit | 2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b (patch) | |
tree | a083736322f89e8a0440f52c82c0922fc084798f /mplayer.c | |
parent | 2993acdc3118ec01274cf357336760443bfce561 (diff) | |
parent | 59f2911c3ec64fcb9db8ac8e1216cf01506cac29 (diff) | |
download | mpv-2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b.tar.bz2 mpv-2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b.tar.xz |
Merge svn changes up to r26540
Conflicts:
Makefile
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3396,7 +3396,7 @@ if(mpctx->sh_video){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties); mpctx->sh_video=mpctx->d_video->sh=NULL; } else { - mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", + mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_FilefmtFourccSizeFpsFtime, mpctx->demuxer->file_format,mpctx->sh_video->format, mpctx->sh_video->disp_w,mpctx->sh_video->disp_h, mpctx->sh_video->fps,mpctx->sh_video->frametime ); |