From 0e757bf9daa55db9fa7052efe5aef09f90044054 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 24 Apr 2008 05:49:44 +0300 Subject: Remove _s/_st suffix from some struct names Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless. --- libmenu/vf_menu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libmenu/vf_menu.c') diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index ea63527951..2cd68f3205 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -41,9 +41,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 struct vo *video_out = mpctx_get_video_out(vf->priv->current->ctx); if(pause_mpi) { put_image(vf,pause_mpi, MP_NOPTS_VALUE); @@ -107,7 +107,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)) ) { @@ -124,7 +124,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) { @@ -200,7 +200,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 HAVE_FREETYPE // here is the right place to get screen dimensions @@ -214,7 +214,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