diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-17 12:33:09 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-17 12:33:09 +0000 |
| commit | 29a164309f1d5bb13589dc0c38342cd585065c4e (patch) | |
| tree | 4200c5fac43b328ad7e99f20aebcde7c8b001496 /libvo/w32_common.c | |
| parent | dd1a5a82c11db30b8bbdc4c002970cb4d9b0ec2f (diff) | |
| download | mpv-29a164309f1d5bb13589dc0c38342cd585065c4e.tar.bz2 mpv-29a164309f1d5bb13589dc0c38342cd585065c4e.tar.xz | |
Fix compilation under MinGW with X11 enabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/w32_common.c')
| -rw-r--r-- | libvo/w32_common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c index eec817d68f..1e2397d406 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -29,6 +29,7 @@ uint32_t o_dwidth; uint32_t o_dheight; static HINSTANCE hInstance; +#define vo_window vo_w32_window HWND vo_window = 0; static int event_flags; static int mon_cnt; @@ -147,7 +148,7 @@ static BOOL CALLBACK mon_enum(HMONITOR hmon, HDC hdc, LPRECT r, LPARAM p) { return TRUE; } -void update_xinerama_info(void) { +void w32_update_xinerama_info(void) { xinerama_x = xinerama_y = 0; if (xinerama_screen < -1) { int tmp; @@ -186,7 +187,7 @@ static void updateScreenProperties() { vo_screenwidth = dm.dmPelsWidth; vo_screenheight = dm.dmPelsHeight; vo_depthonscreen = dm.dmBitsPerPel; - update_xinerama_info(); + w32_update_xinerama_info(); } static void changeMode(void) { @@ -310,7 +311,7 @@ int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) { return createRenderingContext(); } -int vo_init(void) { +int vo_w32_init(void) { HICON mplayerIcon = 0; char exedir[MAX_PATH]; HINSTANCE user32; |