summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xvidix.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-31 11:49:30 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-31 11:49:30 +0000
commitc97dccacbd3a56e65545e9b88a22c2d96ef48add (patch)
tree6aa827be43cdc83d4949e333e61e879c74c7eb22 /libvo/vo_xvidix.c
parent947903ce8d0db2df2e0fca35d8e8225711e6165b (diff)
downloadmpv-c97dccacbd3a56e65545e9b88a22c2d96ef48add.tar.bz2
mpv-c97dccacbd3a56e65545e9b88a22c2d96ef48add.tar.xz
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4442 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xvidix.c')
-rw-r--r--libvo/vo_xvidix.c28
1 files changed, 4 insertions, 24 deletions
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 05ea75067b..1a15072d4e 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -220,11 +220,12 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
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 uint32_t query_format(uint32_t format)
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)