From 7a3fe6ccdbe745a92a8595a80f302665b8fdf649 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 8 Sep 2010 18:34:21 +0000 Subject: [PATCH] menu: Move vf_info_menu extern declaration to menu.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32089 b3059339-0415-0410-9bf9-f77b7e298cf2 Mark vf_info_menu declaration as const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32109 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmenu/menu.h | 1 + libmenu/vf_menu.c | 2 +- mplayer.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmenu/menu.h b/libmenu/menu.h index 50cb128766..0414aea9b4 100644 --- a/libmenu/menu.h +++ b/libmenu/menu.h @@ -25,6 +25,7 @@ extern double menu_mouse_x; extern double menu_mouse_y; extern int menu_mouse_pos_updated; +extern const struct vf_info vf_info_menu; struct menu_priv_s; typedef struct menu_s menu_t; diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index d068c39e5b..1a5d003e94 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -257,7 +257,7 @@ static int open_vf(vf_instance_t *vf, char* args){ } -vf_info_t vf_info_menu = { +const vf_info_t vf_info_menu = { "Internal filter for libmenu", "menu", "Albeu", diff --git a/mplayer.c b/mplayer.c index 0b8f980372..d4a624c696 100644 --- a/mplayer.c +++ b/mplayer.c @@ -370,7 +370,6 @@ char* current_module=NULL; // for debugging #ifdef CONFIG_MENU #include "m_struct.h" #include "libmenu/menu.h" -extern vf_info_t vf_info_menu; static const vf_info_t* const libmenu_vfs[] = { &vf_info_menu, NULL