diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-02 16:44:44 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-02 16:44:44 +0000 |
| commit | e0bbbcfa838acbdf0e676273e945a029b2ac27f5 (patch) | |
| tree | 39d2d9167e439cd0dc3f68fabbbb0c15c7be43a6 /libvo | |
| parent | 47d716f1017d03067df4e19242174eb022c76a22 (diff) | |
| download | mpv-e0bbbcfa838acbdf0e676273e945a029b2ac27f5.tar.bz2 mpv-e0bbbcfa838acbdf0e676273e945a029b2ac27f5.tar.xz | |
win95 fix fix by Rune Petersen <rune.mail-list at mail.tele.dk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14303 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_directx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index d20619fe85..ab1b9f6f6e 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -380,13 +380,10 @@ static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, L selected_guid_ptr = &selected_guid; } mi.cbSize = sizeof(mi); - if(myGetMonitorInfo){ + if (myGetMonitorInfo(hm, &mi)) { monitor_rect = mi.rcMonitor; } - }else{ - mp_msg(MSGT_VO, MSGL_ERR, "-adapter is not supported on Win95\n"); - } mp_msg(MSGT_VO, MSGL_INFO ,"\t\t<--"); } mp_msg(MSGT_VO, MSGL_INFO ,"\n"); @@ -405,7 +402,11 @@ static uint32_t Directx_InitDirectDraw() HINSTANCE user32dll=LoadLibrary("user32.dll"); if(user32dll){ - myGetMonitorInfo=GetProcAddress(user32dll,"GetMonitorInfo"); + myGetMonitorInfo=GetProcAddress(user32dll,"GetMonitorInfoA"); + if(!myGetMonitorInfo && vo_adapter_num){ + mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx> -adapter is not supported on Win95\n"); + vo_adapter_num = 0; + } } mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>Initing DirectDraw\n" ); |