diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /libmenu | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmenu/menu.h b/libmenu/menu.h index cc76b5b7a3..bfb8f9a30b 100644 --- a/libmenu/menu.h +++ b/libmenu/menu.h @@ -116,4 +116,6 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt, void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h); +void vf_menu_pause_update(struct vf_instance *vf); + #endif /* MPLAYER_MENU_H */ |