Mercurial > mplayer.hg

changeset 25787:143989c7a3bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid some pointer conversion warnings (the code is messy but not wrong)
author reimar
date Sun, 20 Jan 2008 09:50:50 +0000
parents 2734c7331d4e
children 495cbb49fb1b
files libvo/w32_common.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/w32_common.c	Sun Jan 20 09:41:50 2008 +0000
+++ b/libvo/w32_common.c	Sun Jan 20 09:50:50 2008 +0000
@@ -360,7 +360,7 @@
   }
 
     if (WinID >= 0)
-      vo_window = WinID;
+      vo_window = (HWND)WinID;
     else {
     vo_window = CreateWindowEx(0, classname, classname,
                   vo_border ? (WS_OVERLAPPEDWINDOW | WS_SIZEBOX) : WS_POPUP,
@@ -376,7 +376,7 @@
     myEnumDisplayMonitors = NULL;
     user32 = GetModuleHandle("user32.dll");
     if (user32) {
-        myMonitorFromWindow = GetProcAddress(user32, "MonitorFromWindow");
+        myMonitorFromWindow = (void *)GetProcAddress(user32, "MonitorFromWindow");
         myGetMonitorInfo = GetProcAddress(user32, "GetMonitorInfoA");
         myEnumDisplayMonitors = GetProcAddress(user32, "EnumDisplayMonitors");
     }