Mercurial > mplayer.hg
changeset 286:b2f3f2ab3787
integrated vo_svga by se7en
| author | arpi_esp |
|---|---|
| date | Thu, 05 Apr 2001 19:01:27 +0000 |
| parents | 5cb4fdc94146 |
| children | abc78352e35e |
| files | libvo/video_out.c libvo/vo_svga.c |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/video_out.c Thu Apr 05 08:42:02 2001 +0000 +++ b/libvo/video_out.c Thu Apr 05 19:01:27 2001 +0000 @@ -50,6 +50,7 @@ extern vo_functions_t video_out_md5; extern vo_functions_t video_out_syncfb; extern vo_functions_t video_out_fbdev; +extern vo_functions_t video_out_svga; vo_functions_t* video_out_drivers[] = { @@ -84,6 +85,9 @@ #ifdef HAVE_FBDEV &video_out_fbdev, #endif +#ifdef HAVE_SVGALIB + &video_out_svga, +#endif &video_out_null, &video_out_odivx, &video_out_pgm,
--- a/libvo/vo_svga.c Thu Apr 05 08:42:02 2001 +0000 +++ b/libvo/vo_svga.c Thu Apr 05 19:01:27 2001 +0000 @@ -59,7 +59,7 @@ static uint8_t checked = 0; -static checksupportedmodes() { +static void checksupportedmodes() { int i; checked = 1; @@ -101,14 +101,20 @@ case 16: vid_mode = 18; break; case 15: vid_mode = 17; break; } - if (vga_setmode(vid_mode) == -1) + if (vga_setmode(vid_mode) == -1){ + printf("vo_svga: vga_setmode(%d) failed.\n",vid_mode); return(1); // error - if (gl_setcontextvga(vid_mode)) + } + if (gl_setcontextvga(vid_mode)){ + printf("vo_svga: gl_setcontextvga(%d) failed.\n",vid_mode); return(1); // error + } screen = gl_allocatecontext(); gl_getcontext(screen); - if (gl_setcontextvgavirtual(vid_mode)) + if (gl_setcontextvgavirtual(vid_mode)){ + printf("vo_svga: gl_setcontextvgavirtual(%d) failed.\n",vid_mode); return(1); // error + } virt = gl_allocatecontext(); gl_getcontext(virt); gl_setcontext(virt);