summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-20 09:50:50 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-20 09:50:50 +0000
commit2b316697f3bc6981909e9496228019dd8d6a533b (patch)
tree0d9c8e0e4ed55894c1b2b590d68c84e98d14c0be /libvo
parentb34d4097bbf7a0d9fdbddd85cc033e98cb598db8 (diff)
downloadmpv-2b316697f3bc6981909e9496228019dd8d6a533b.tar.bz2
mpv-2b316697f3bc6981909e9496228019dd8d6a533b.tar.xz
Avoid some pointer conversion warnings (the code is messy but not wrong)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25815 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/w32_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index 4e54fb1e89..c7f835c64f 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -360,7 +360,7 @@ int vo_w32_init(void) {
}
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 @@ int vo_w32_init(void) {
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");
}