From 1888e57af7e1ce51517ad9bdc2d201eaf84a98d2 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@glyph.nonexistent.invalid>
Date: Sat, 29 May 2010 17:15:55 +0300
Subject: cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"

Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
---
 libmpcodecs/vf_expand.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'libmpcodecs/vf_expand.c')

diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 683ed633fe..57226acb93 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -75,7 +75,7 @@ static struct vf_priv_s {
 //===========================================================================//
 #ifdef OSD_SUPPORT
 
-static struct vf_instance* vf=NULL; // fixme (needs sub.c changes)
+static struct vf_instance *vf=NULL; // fixme (needs sub.c changes)
 static int orig_w,orig_h;
 
 static void remove_func_2(int x0,int y0, int w,int h){
@@ -185,7 +185,7 @@ static void draw_func(void *ctx, int x0,int y0, int w,int h,unsigned char* src,
     }
 }
 
-static void draw_osd(struct vf_instance* vf_,int w,int h){
+static void draw_osd(struct vf_instance *vf_,int w,int h){
     vf=vf_;orig_w=w;orig_h=h;
 //    printf("======================================\n");
     if(vf->priv->exp_w!=w || vf->priv->exp_h!=h ||
@@ -216,7 +216,7 @@ static void draw_osd(struct vf_instance* vf_,int w,int h){
 #endif
 //===========================================================================//
 
-static int config(struct vf_instance* vf,
+static int config(struct vf_instance *vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt)
 {
@@ -273,7 +273,7 @@ static int config(struct vf_instance* vf,
 // codec -copy-> expand --DR--> vo
 // codec -copy-> expand -copy-> vo (worst case)
 
-static void get_image(struct vf_instance* vf, mp_image_t *mpi){
+static void get_image(struct vf_instance *vf, mp_image_t *mpi){
 //    if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working
 #ifdef OSD_SUPPORT
     if(vf->priv->osd_enabled && (mpi->flags&MP_IMGFLAG_PRESERVE)){
@@ -318,7 +318,7 @@ static void get_image(struct vf_instance* vf, mp_image_t *mpi){
     }
 }
 
-static void start_slice(struct vf_instance* vf, mp_image_t *mpi){
+static void start_slice(struct vf_instance *vf, mp_image_t *mpi){
 //    printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK);
     if(!vf->next->draw_slice){
 	mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
@@ -336,7 +336,7 @@ static void start_slice(struct vf_instance* vf, mp_image_t *mpi){
     vf->priv->first_slice = 1;
 }
 
-static void draw_top_blackbar_slice(struct vf_instance* vf,
+static void draw_top_blackbar_slice(struct vf_instance *vf,
 				    unsigned char** src, int* stride, int w,int h, int x, int y){
     if(vf->priv->exp_y>0 && y == 0) {
 	vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
@@ -345,7 +345,7 @@ static void draw_top_blackbar_slice(struct vf_instance* vf,
 
 }
 
-static void draw_bottom_blackbar_slice(struct vf_instance* vf,
+static void draw_bottom_blackbar_slice(struct vf_instance *vf,
 				    unsigned char** src, int* stride, int w,int h, int x, int y){
     if(vf->priv->exp_y+vf->h<vf->dmpi->h && y+h == vf->h) {
 	unsigned char *src2[MP_MAX_PLANES];
@@ -365,7 +365,7 @@ static void draw_bottom_blackbar_slice(struct vf_instance* vf,
     }
 }
 
-static void draw_slice(struct vf_instance* vf,
+static void draw_slice(struct vf_instance *vf,
         unsigned char** src, int* stride, int w,int h, int x, int y){
 //    printf("draw_slice() called %d at %d\n",h,y);
 
@@ -388,7 +388,7 @@ static void draw_slice(struct vf_instance* vf,
     vf->priv->first_slice = 0;
 }
 
-static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
     if (vf->priv->passthrough) {
       mp_image_t *dmpi = vf_get_image(vf->next, IMGFMT_MPEGPES,
                                       MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h);
@@ -443,7 +443,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int control(struct vf_instance* vf, int request, void* data){
+static int control(struct vf_instance *vf, int request, void* data){
 #ifdef OSD_SUPPORT
     switch(request){
     case VFCTRL_SET_OSD_OBJ:
@@ -461,7 +461,7 @@ static int control(struct vf_instance* vf, int request, void* data){
     return vf_next_control(vf,request,data);
 }
 
-static int query_format(struct vf_instance* 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