diff options
| author | Grigori Goronzy <greg@blackbox> | 2009-08-06 22:58:31 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-07 00:13:33 +0300 |
| commit | 1e98ef77899e4314c2b3ada2388f9db61e0fd53d (patch) | |
| tree | b03dd045478431cf6eada3b0e7df08b6ec488946 /libmpcodecs/vf_ass.c | |
| parent | 4a36b51ea62bae47ea9bf8df3031c88a1992b7a6 (diff) | |
| download | mpv-1e98ef77899e4314c2b3ada2388f9db61e0fd53d.tar.bz2 mpv-1e98ef77899e4314c2b3ada2388f9db61e0fd53d.tar.xz | |
Change type names to match upstream libass
Diffstat (limited to 'libmpcodecs/vf_ass.c')
| -rw-r--r-- | libmpcodecs/vf_ass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c index 4c2f9bef7c..5ea2f8b10d 100644 --- a/libmpcodecs/vf_ass.c +++ b/libmpcodecs/vf_ass.c @@ -62,7 +62,7 @@ static const struct vf_priv_s { // 0 = insert always int auto_insert; - ass_renderer_t* ass_priv; + ASS_Renderer* ass_priv; unsigned char* planes[3]; struct line_limits { @@ -71,7 +71,7 @@ static const struct vf_priv_s { } *line_limits; } vf_priv_dflt; -extern ass_track_t* ass_track; +extern ASS_Track *ass_track; extern float sub_delay; extern int sub_visibility; @@ -309,12 +309,12 @@ static void my_draw_bitmap(struct vf_instance* vf, unsigned char* bitmap, int bi } } -static int render_frame(struct vf_instance* vf, mp_image_t *mpi, const ass_image_t* img) +static int render_frame(struct vf_instance* vf, mp_image_t *mpi, const ASS_Image *img) { if (img) { for (int i = 0; i < (vf->priv->outh + 1) / 2; i++) vf->priv->line_limits[i] = (struct line_limits){65535, 0}; - for (const ass_image_t *im = img; im; im = im->next) + for (const ASS_Image *im = img; im; im = im->next) update_limits(vf, im->dst_y, im->dst_y + im->h, im->dst_x, im->dst_x + im->w); copy_from_image(vf); while (img) { @@ -329,7 +329,7 @@ static int render_frame(struct vf_instance* vf, mp_image_t *mpi, const ass_image static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts) { - ass_image_t* images = 0; + ASS_Image* images = 0; if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) images = ass_mp_render_frame(vf->priv->ass_priv, ass_track, (pts+sub_delay) * 1000 + .5, NULL); @@ -354,7 +354,7 @@ static int control(vf_instance_t *vf, int request, void *data) { switch (request) { case VFCTRL_INIT_EOSD: - vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); + vf->priv->ass_priv = ass_renderer_init((ASS_Library*)data); if (!vf->priv->ass_priv) return CONTROL_FALSE; ass_configure_fonts(vf->priv->ass_priv); return CONTROL_TRUE; |