github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

cleanup: remove warnings under libmenu/

This commit is contained in:
Clément Bœsch 2011-05-07 07:51:48 +02:00 committed by Uoti Urpala
parent fbf6885395
commit a8b11797d8
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
access_mpcontext.h
View File

@ -20,7 +20,7 @@
#define MPLAYER_ACCESS_MPCONTEXT_H
struct MPContext;
const void *mpctx_get_video_out(struct MPContext *mpctx);
void *mpctx_get_video_out(struct MPContext *mpctx);
void *mpctx_get_demuxer(struct MPContext *mpctx);
void *mpctx_get_playtree_iter(struct MPContext *mpctx);
void *mpctx_get_mixer(struct MPContext *mpctx);

4
libmenu/menu.c
View File

@ -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;

4
libmenu/menu_dvbin.c
View File

@ -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;

2
libmenu/menu_filesel.c
View File

@ -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);

2
libmenu/vf_menu.c
View File

@ -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

2
mplayer.c
View File

@ -362,7 +362,7 @@ int use_filename_title;
#include "metadata.h"
const void *mpctx_get_video_out(MPContext *mpctx)
void *mpctx_get_video_out(MPContext *mpctx)
{
return mpctx->video_out;
}