From 8f617641170e1c3577f2d9e05db4797501f58297 Mon Sep 17 00:00:00 2001
From: arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 5 Apr 2001 19:01:27 +0000
Subject: [PATCH] integrated vo_svga by se7en

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@287 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/video_out.c |  4 ++++
 libvo/vo_svga.c   | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libvo/video_out.c b/libvo/video_out.c
index 9d46f706d2..ec317e00e8 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -50,6 +50,7 @@ extern vo_functions_t video_out_pgm;
 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[] =
 {
@@ -83,6 +84,9 @@ vo_functions_t* video_out_drivers[] =
 #endif
 #ifdef HAVE_FBDEV
 	&video_out_fbdev,
+#endif
+#ifdef HAVE_SVGALIB
+	&video_out_svga,
 #endif
         &video_out_null,
         &video_out_odivx,
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index b18d9f0a5b..7c509a6c5f 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -59,7 +59,7 @@ static uint8_t bpp;
 
 static uint8_t checked = 0;
 
-static checksupportedmodes() {
+static void checksupportedmodes() {
   int i;
   
   checked = 1;
@@ -101,14 +101,20 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
         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);