Mercurial > mplayer.hg
diff libvo/vo_xv.c @ 6016:be9cd7d845c2
-zoom, -fs with x[11|mga|v] fix -- round two
| author | pontscho |
|---|---|
| date | Wed, 08 May 2002 20:24:35 +0000 |
| parents | bb1f3552f118 |
| children | 421781c5b128 |
line wrap: on
line diff
--- a/libvo/vo_xv.c Wed May 08 19:21:36 2002 +0000 +++ b/libvo/vo_xv.c Wed May 08 20:24:35 2002 +0000 @@ -786,6 +786,8 @@ static void uninit(void) { int i; +#if 0 + if(!mDisplay) return; saver_on(mDisplay); // screen saver back on if(vo_config_count) for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); @@ -793,11 +795,24 @@ vo_vm_close(mDisplay); #endif if(vo_config_count) vo_x11_uninit(mDisplay, vo_window); + +#else + + if ( !vo_config_count ) return; + saver_on(mDisplay); // screen saver back on + for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); +#ifdef HAVE_XF86VM + vo_vm_close(mDisplay); +#endif + vo_x11_uninit(mDisplay, vo_window); + +#endif } static uint32_t preinit(const char *arg) { XvPortID xv_p; + if(arg) { mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg);