diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libvo/vo_cvidix.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libvo/vo_cvidix.c')
| -rw-r--r-- | libvo/vo_cvidix.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c index c2565ef7ec..75effe0350 100644 --- a/libvo/vo_cvidix.c +++ b/libvo/vo_cvidix.c @@ -81,10 +81,15 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,uint32_t d_h if(vo_screenwidth && vo_screenheight){ if(!vo_geometry)center=1; } - else mp_msg(MSGT_VO, MSGL_WARN, "vo_cvidix: warn: screenwidth and height not set assuming 640x480\n"); } - if(!vo_screenwidth)vo_screenwidth=640; - if(!vo_screenheight)vo_screenheight=480; + if(!vo_screenwidth){ + mp_msg(MSGT_VO, MSGL_WARN, "vo_cvidix: Screen width not set (see -screenw), assuming 640 pixels.\n"); + vo_screenwidth = 640; + } + if(!vo_screenheight){ + mp_msg(MSGT_VO, MSGL_WARN, "vo_cvidix: Screen height not set (see -screenh), assuming 480 pixels.\n"); + vo_screenheight = 480; + } swidth = width; sheight = height; sformat = format; |