Mercurial > mplayer.hg
changeset 34024:b48986b92913
Remove unnecessary #ifdefs from header file.
| author | reimar |
|---|---|
| date | Mon, 19 Sep 2011 22:03:36 +0000 |
| parents | d0ecb5d14258 |
| children | e7f393cb9d0f |
| files | libvo/x11_common.h |
| diffstat | 1 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/x11_common.h Sun Sep 18 16:51:40 2011 +0000 +++ b/libvo/x11_common.h Mon Sep 19 22:03:36 2011 +0000 @@ -96,8 +96,9 @@ extern GC vo_gc; extern XSizeHints vo_hint; -#ifdef CONFIG_XV -//XvPortID xv_port; + + +// XVideo related declarations extern unsigned int xv_port; int vo_xv_set_eq(uint32_t xv_port, const char * name, int value); @@ -132,7 +133,8 @@ /*** test functions for common suboptions ***/ int xv_test_ck( void * arg ); int xv_test_ckm( void * arg ); -#endif + + void vo_setwindow( Window w,GC g ); void vo_x11_putkey(int key); @@ -141,10 +143,13 @@ void saver_off( Display * ); void saver_on( Display * ); -#ifdef CONFIG_XF86VM + + +// XF86VM-related functions void vo_vm_switch(void); void vo_vm_close(void); -#endif + + void update_xinerama_info(void);