[Mplayer-cvslog] CVS: main/libvo vo_xvidix.c,1.15,1.16

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv21063

Modified Files:
	vo_xvidix.c 
Log Message:
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vo_xvidix.c	31 Jan 2002 10:23:39 -0000	1.15
+++ vo_xvidix.c	31 Jan 2002 11:49:30 -0000	1.16
@@ -220,11 +220,12 @@
 	case IMGFMT_YV12:
 	    image_depth = 12;
 	    break;
+	case IMGFMT_UYVY:
 	case IMGFMT_YUY2:
 	    image_depth = 16;
 	    break;
 	default:
-	    mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s",
+	    mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s\n",
 		vo_format_name(format));
 	    return(-1);
     }
@@ -438,30 +439,9 @@
 static void uninit(void)
 {
     vidix_term();
-    saver_on(mDisplay); /* screen saver back on */
-#ifdef HAVE_NEW_GUI
-    /* destroy window only if it's not controlled by GUI */
-    if (vo_window == None)
-#endif
-    {
-	if (!(WinID > 0)) /* don't destory window if -wid specified */
-	{
-	    XDestroyWindow(mDisplay, mWindow);
-	    XCloseDisplay(mDisplay);
-	}
-    }
-}
-
-/* i think this is obsoleted.... -- alex */
-static void Terminate_Display_Process(void) 
-{
-    getchar();	/* wait for enter to remove window */
-    vidix_term();
-    XDestroyWindow(mDisplay, mWindow);
-    XCloseDisplay(mDisplay);
-    X_already_started = 0;
 
-    return;
+    saver_on(mDisplay); /* screen saver back on */
+    vo_x11_uninit(mDisplay, mWindow);
 }
 
 static uint32_t preinit(const char *arg)