summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-10-06 08:42:13 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-10-06 08:42:13 +0000
commit1addcfe22be3f388ef1fcabb2940b106a25f641f (patch)
tree7c1a0541412e5bf735ce0d1a5819a53d8f96c838 /libvo
parentabf62e2e0ab4649ad33985424253466569dfa775 (diff)
downloadmpv-1addcfe22be3f388ef1fcabb2940b106a25f641f.tar.bz2
mpv-1addcfe22be3f388ef1fcabb2940b106a25f641f.tar.xz
Currently vbeGetProtModeInfo call the 0x4f0a function of int 10h the get
a simple 32 bits protected mode interface to some VESA functions. This protected mode interface is interesting because it's quicker than the raw int 10h interface. Unfortunatly, begining with VBE 3.0, the 0x4f0a function is optional, and some video cards don't implement it (3dfx, intel 845/855/865...). This protected mode interface is then only used in vbeSetWindow and vbeSetDisplayStart :  - vbeSetWindow already implement an alternative methode if protected mode interface is not available.  - vbeSetDisplayStart also contain an alternative implementation, but this one is disabled with a #if 0. I don't exactly know why because it works well ! So currently, cards which don't have the 0x4f0a function are not supported. This patch correct this.  - vbeGetProtModeInfo failure is not fatal.  - vbeSetDisplayStart has it's alternative implementation reenabled.    it's used only with cards which don't have the 0x4f0a function    so this won't make any difference for cards which were already    working. This patch also make the failure of vbeGetModeInfo not fatal. The VBE 3.0 standard state that GetModeInfo can fail with some mode which are listed as supported if the mode can't be used in the current situation (not enough video memory for example). So a failure of vbeGetModeInfo don't mean that other modes won't work and should really not be fatal. patch by Aurelien Jacobs <aurel@gnuage.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13569 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_vesa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 7981dda42b..2dc0204916 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -739,7 +739,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
if((err=vbeGetModeInfo(mode_ptr[i],&vmib)) != VBE_OK)
{
PRINT_VBE_ERR("vbeGetModeInfo",err);
- return -1;
+ continue;
}
if(vmib.XResolution >= w &&
vmib.YResolution >= h &&