diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libmenu | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/vf_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index cb0af69afa..c2c7f127a5 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -33,7 +33,7 @@ static struct vf_priv_s* st_priv = NULL; static mp_image_t* pause_mpi = NULL; static int go2pause = 0; /// if nonzero display menu at startup -int attribute_used menu_startup = 0; +int menu_startup = 0; struct vf_priv_s { menu_t* root; |