Mercurial > mplayer.hg
changeset 22767:b983b77b746f
call vbeGetControllerInfo() only once
Subsequent calls would fail with some video chip (including i945)
when using -fixed-vo.
| author | aurel |
|---|---|
| date | Fri, 23 Mar 2007 00:31:29 +0000 |
| parents | 0d730ec2c5c5 |
| children | 7989c3586b9e |
| files | libvo/vo_vesa.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_vesa.c Thu Mar 22 21:17:54 2007 +0000 +++ b/libvo/vo_vesa.c Fri Mar 23 00:31:29 2007 +0000 @@ -620,7 +620,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { - struct VbeInfoBlock vib; + static struct VbeInfoBlock vib; + static int vib_set; struct VesaModeInfoBlock vmib; struct VesaCRTCInfoBlock crtc_pass; size_t i,num_modes; @@ -649,12 +650,13 @@ } if((err=vbeInit()) != VBE_OK) { PRINT_VBE_ERR("vbeInit",err); return -1; } memcpy(vib.VESASignature,"VBE2",4); - if((err=vbeGetControllerInfo(&vib)) != VBE_OK) + if(!vib_set && (err=vbeGetControllerInfo(&vib)) != VBE_OK) { PRINT_VBE_ERR("vbeGetControllerInfo",err); mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_VESA_PossibleReasonNoVbe2BiosFound); return -1; } + vib_set = 1; /* Print general info here */ mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_VESA_FoundVesaVbeBiosVersion, (int)(vib.VESAVersion >> 8) & 0xff,