--- configure	13 Nov 2003 21:03:11 -0000	1.811
+++ configure	15 Nov 2003 18:19:01 -0000
@@ -3121,9 +3121,9 @@
   _def_gl='#define HAVE_GL 1'
   if test "$_gl_win32" = yes ; then
     _def_gl_win32='#define GL_WIN32 1' 
-    _vosrc="$_vosrc vo_gl2.c w32_common.c"
+    _vosrc="$_vosrc vo_gl2.c vo_glsimple.c w32_common.c"
   else
-    _vosrc="$_vosrc vo_gl.c vo_gl2.c"
+    _vosrc="$_vosrc vo_gl.c vo_gl2.c vo_glsimple.c"
   fi
   _vomodules="opengl $_vomodules"
 else
--- libvo/video_out.c	4 Nov 2003 20:05:47 -0000	1.80
+++ libvo/video_out.c	15 Nov 2003 18:19:08 -0000
@@ -61,6 +61,7 @@
 extern vo_functions_t video_out_xv;
 extern vo_functions_t video_out_gl;
 extern vo_functions_t video_out_gl2;
+extern vo_functions_t video_out_glsimple;
 extern vo_functions_t video_out_dga;
 extern vo_functions_t video_out_fsdga;
 extern vo_functions_t video_out_sdl;
@@ -154,6 +155,7 @@
 	        &video_out_gl,
 	#endif
         &video_out_gl2,
+        &video_out_glsimple,
 #endif
 #ifdef HAVE_DGA
         &video_out_dga,
--- libvo/w32_common.c	19 Sep 2003 14:33:51 -0000	1.1
+++ libvo/w32_common.c	15 Nov 2003 18:19:10 -0000
@@ -118,8 +118,8 @@
     vo_screenwidth = dm.dmPelsWidth;
     vo_screenheight = dm.dmPelsHeight;
     aspect_save_screenres(vo_screenwidth, vo_screenheight);
-    if (vo_fs)
-	aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
+    vo_dwidth = vo_screenwidth;
+    vo_dheight = vo_screenheight;
 
     ChangeDisplaySettings(&dm, CDS_FULLSCREEN);
 }
@@ -264,4 +264,5 @@
     destroyRenderingContext();
     DestroyWindow(vo_hwnd);
     vo_hwnd = 0;
+    UnregisterClass(classname, 0);
 }