summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl.c
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2009-08-06 22:58:31 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-07 00:13:33 +0300
commit1e98ef77899e4314c2b3ada2388f9db61e0fd53d (patch)
treeb03dd045478431cf6eada3b0e7df08b6ec488946 /libvo/vo_gl.c
parent4a36b51ea62bae47ea9bf8df3031c88a1992b7a6 (diff)
downloadmpv-1e98ef77899e4314c2b3ada2388f9db61e0fd53d.tar.bz2
mpv-1e98ef77899e4314c2b3ada2388f9db61e0fd53d.tar.xz
Change type names to match upstream libass
Diffstat (limited to 'libvo/vo_gl.c')
-rw-r--r--libvo/vo_gl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index ceb70ec32e..13ff34cd68 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -289,11 +289,11 @@ static void clearEOSD(void) {
static void do_render_osd(int);
-static inline int is_tinytex(ass_image_t *i, int tinytexcur) {
+static inline int is_tinytex(ASS_Image *i, int tinytexcur) {
return i->w < TINYTEX_SIZE && i->h < TINYTEX_SIZE && tinytexcur < TINYTEX_MAX;
}
-static inline int is_smalltex(ass_image_t *i, int smalltexcur) {
+static inline int is_smalltex(ASS_Image *i, int smalltexcur) {
return i->w < SMALLTEX_SIZE && i->h < SMALLTEX_SIZE && smalltexcur < SMALLTEX_MAX;
}
@@ -318,8 +318,8 @@ static void genEOSD(mp_eosd_images_t *imgs) {
int smalltexcur = 0;
GLuint *curtex;
GLint scale_type = scaled_osd ? GL_LINEAR : GL_NEAREST;
- ass_image_t *img = imgs->imgs;
- ass_image_t *i;
+ ASS_Image *img = imgs->imgs;
+ ASS_Image *i;
if (imgs->changed == 0) // there are elements, but they are unchanged
return;