diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-05-07 07:51:48 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-06-24 22:55:09 +0300 |
| commit | a8b11797d86546c894b88ed55a46558dfa972324 (patch) | |
| tree | 91f1b4830d466b239e3fbefcc73d43dc3ead37d6 /libmenu | |
| parent | fbf688539540fa840631d2570befb3f2eae106f8 (diff) | |
| download | mpv-a8b11797d86546c894b88ed55a46558dfa972324.tar.bz2 mpv-a8b11797d86546c894b88ed55a46558dfa972324.tar.xz | |
cleanup: remove warnings under libmenu/
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu.c | 4 | ||||
| -rw-r--r-- | libmenu/menu_dvbin.c | 4 | ||||
| -rw-r--r-- | libmenu/menu_filesel.c | 2 | ||||
| -rw-r--r-- | libmenu/vf_menu.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c index 111d535372..0f920825b0 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -447,7 +447,11 @@ static char *menu_fribidi(char *txt) static size_t buffer_size = 1024; static char *outputstr; +#if FRIBIDI_INTERFACE_VERSION < 3 FriBidiCharType base; +#else + FriBidiParType base; +#endif fribidi_boolean log2vis; size_t len; diff --git a/libmenu/menu_dvbin.c b/libmenu/menu_dvbin.c index 05dd5909cb..c21fadf635 100644 --- a/libmenu/menu_dvbin.c +++ b/libmenu/menu_dvbin.c @@ -125,7 +125,7 @@ static int fill_channels_menu(menu_t *menu, dvb_channels_list *dvb_list_ptr) } else { - mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n", + mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %zd bytes for menu item: %s, exit\n", sizeof(list_entry_t), strerror(errno)); break; } @@ -155,7 +155,7 @@ static int fill_cards_menu(menu_t *menu, dvb_config_t *conf) } else { - fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n", + fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %zd bytes for menu item: %s, exit\n", sizeof(list_entry_t), strerror(errno)); if(n) return 1; diff --git a/libmenu/menu_filesel.c b/libmenu/menu_filesel.c index 306e3133ca..7c63954d1d 100644 --- a/libmenu/menu_filesel.c +++ b/libmenu/menu_filesel.c @@ -230,7 +230,6 @@ static int open_dir(menu_t* menu,char* args) { struct stat st; int n; int path_fp; - char* p = NULL; list_entry_t* e; DIR* dirp; extern int file_filter; @@ -242,7 +241,6 @@ static int open_dir(menu_t* menu,char* args) { mpriv->dir = strdup(args); if(mpriv->p.title && mpriv->p.title != mpriv->title && mpriv->p.title != cfg_dflt.p.title) free(mpriv->p.title); - p = strstr(mpriv->title,"%p"); mpriv->p.title = replace_path(mpriv->title,mpriv->dir,0); diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 994c7134ea..2679556d77 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -56,7 +56,7 @@ struct vf_priv_s { static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts); void vf_menu_pause_update(struct vf_instance *vf) { - const struct vo *video_out = mpctx_get_video_out(vf->priv->current->ctx); + struct vo *video_out = mpctx_get_video_out(vf->priv->current->ctx); if(pause_mpi) { put_image(vf,pause_mpi, MP_NOPTS_VALUE); // Don't draw the osd atm |