diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-13 03:52:51 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-13 03:52:51 +0200 |
commit | 738f66b1bc98073d74af7031c4454322157a15ec (patch) | |
tree | 25d69a5d92ea4440f7e08e3c82cc5bb3a1d4598e /libvo/x11_common.h | |
parent | 1e869638280f962fb80f372d152234f21246c2af (diff) | |
parent | 9f8792e639fee0b706dc5ec83e9b9fa0cf432e61 (diff) | |
download | mpv-738f66b1bc98073d74af7031c4454322157a15ec.tar.bz2 mpv-738f66b1bc98073d74af7031c4454322157a15ec.tar.xz |
Merge svn changes up to r28549
Diffstat (limited to 'libvo/x11_common.h')
-rw-r--r-- | libvo/x11_common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 446a6903df..872e84e174 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -172,8 +172,6 @@ void vo_vm_close(struct vo *vo); void update_xinerama_info(struct vo *vo); int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); -void vo_calc_drwXY(struct vo *vo, uint32_t *drwX, uint32_t *drwY); - void xscreensaver_heartbeat(struct vo_x11_state *x11); // Old VOs use incompatible function calls, translate them to new @@ -204,7 +202,6 @@ void xscreensaver_heartbeat(struct vo_x11_state *x11); #define vo_x11_classhint(display, window, name) vo_x11_classhint(global_vo, window, name) #define vo_x11_setlayer(display, window, layer) vo_x11_setlayer(global_vo, window, layer) #define xv_setup_colorkeyhandling(a, b) xv_setup_colorkeyhandling(global_vo, a, b) -#define vo_calc_drwXY(drwX, drwY) vo_calc_drwXY(global_vo, drwX, drwY) #define mDisplay global_vo->x11->display #define vo_depthonscreen global_vo->x11->depthonscreen |