diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:53:08 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:56:10 +0200 |
| commit | d46b86bc7c39082b26ec71aa16431f3275d836ff (patch) | |
| tree | 035da87ed658f7d75c0eba5a5d4de5462a4c8ddd /libvo/x11_common.h | |
| parent | a06b32b64e91082c11f747e2910f10a4afd3dfa9 (diff) | |
| parent | 3e8f2815c19703f5cb6f75db2910234d499d9676 (diff) | |
| download | mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.bz2 mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.xz | |
Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index fccad90ced..7f53a4c05c 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -110,7 +110,7 @@ struct vo_x11_state *vo_x11_init_state(void); int vo_init(struct vo *vo); void vo_uninit(struct vo_x11_state *x11); void vo_x11_decoration(struct vo *vo, int d ); -void vo_x11_classhint(struct vo *vo, Window window, char *name); +void vo_x11_classhint(struct vo *vo, Window window, const char *name); void vo_x11_sizehint(struct vo *vo, int x, int y, int width, int height, int max); int vo_x11_check_events(struct vo *vo); void vo_x11_selectinput_witherr(Display *display, Window w, long event_mask); |