diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-04 06:36:36 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:04 +0300 |
| commit | 8716df2a41f6ff05f59577a0433401ea141226f3 (patch) | |
| tree | 491d1c9e1cf862294283335ade557100c2181baf /libmpcodecs/vf_expand.c | |
| parent | 2bcfe1e077fe043751d3f7c73c82be761629419f (diff) | |
| download | mpv-8716df2a41f6ff05f59577a0433401ea141226f3.tar.bz2 mpv-8716df2a41f6ff05f59577a0433401ea141226f3.tar.xz | |
Add context variable to vo_draw_text callback
Add a context variable and rename the function to osd_draw_text. Create
a new vo_draw_text that is a wrapper for VOs using old API.
Diffstat (limited to 'libmpcodecs/vf_expand.c')
| -rw-r--r-- | libmpcodecs/vf_expand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index 44a5549e19..8c4f1445a7 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -96,7 +96,7 @@ static void remove_func(int x0,int y0, int w,int h){ } } -static void draw_func(int x0,int y0, int w,int h,unsigned char* src, unsigned char *srca, int stride){ +static void draw_func(void *ctx, int x0,int y0, int w,int h,unsigned char* src, unsigned char *srca, int stride){ unsigned char* dst; if(!vo_osd_changed_flag && vf->dmpi->planes[0]==vf->priv->fb_ptr){ // ok, enough to update the area inside the video, leave the black bands @@ -177,7 +177,7 @@ static void draw_osd(struct vf_instance_s* vf_,int w,int h){ vo_remove_text(vf->priv->exp_w,vf->priv->exp_h,remove_func); } } - vo_draw_text(vf->priv->exp_w,vf->priv->exp_h,draw_func); + osd_draw_text(vf->priv->exp_w,vf->priv->exp_h,draw_func, NULL); // save buffer pointer for double buffering detection - yes, i know it's // ugly method, but note that codecs with DR support does the same... if(vf->dmpi) |