From e0bc115b4d20cc2f46ac7773e7a6b3ba5d912f97 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 21 Feb 2010 15:48:03 +0000 Subject: cosmetics: Rename struct vf_instance_s --> vf_instance. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmenu/menu.h | 2 +- libmenu/vf_menu.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libmenu') diff --git a/libmenu/menu.h b/libmenu/menu.h index a22dc12abf..1578f5f426 100644 --- a/libmenu/menu.h +++ b/libmenu/menu.h @@ -114,6 +114,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_s* vf); +void vf_menu_pause_update(struct vf_instance *vf); #endif /* MPLAYER_MENU_H */ diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 6a49f671af..c1e9eb220b 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -54,9 +54,9 @@ struct vf_priv_s { int passthrough; }; -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts); +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts); -void vf_menu_pause_update(struct vf_instance_s* vf) { +void vf_menu_pause_update(struct vf_instance *vf) { const vo_functions_t *video_out = mpctx_get_video_out(vf->priv->current->ctx); if(pause_mpi) { put_image(vf,pause_mpi, MP_NOPTS_VALUE); @@ -120,7 +120,7 @@ static int cmd_filter(mp_cmd_t* cmd, int paused, struct vf_priv_s * priv) { return 0; } -static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ +static void get_image(struct vf_instance *vf, mp_image_t *mpi){ mp_image_t *dmpi; if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) { @@ -137,7 +137,7 @@ static int key_cb(int code) { return menu_read_key(st_priv->current,code); } -static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ mp_image_t *dmpi = NULL; if (vf->priv->passthrough) { @@ -213,7 +213,7 @@ static void uninit(vf_instance_t *vf) { } } -static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, +static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { #ifdef CONFIG_FREETYPE // here is the right place to get screen dimensions @@ -227,7 +227,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } -static int query_format(struct vf_instance_s* vf, unsigned int fmt){ +static int query_format(struct vf_instance *vf, unsigned int fmt){ return vf_next_query_format(vf,fmt); } -- cgit v1.2.3