summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2012-08-08 21:11:43 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2012-08-08 21:23:28 +0200
commit7fd43b0bcd5abdcda0a6fe99abb46651f81ec84d (patch)
treef583a3c5327a4b2b8818df16c08d39edb3b4dc0e
parent531778d0564cabc4fdfcef7a8785baa5747cd27b (diff)
downloadmpv-7fd43b0bcd5abdcda0a6fe99abb46651f81ec84d.tar.bz2
mpv-7fd43b0bcd5abdcda0a6fe99abb46651f81ec84d.tar.xz
osx: fix build
adapt the osx VOs to build against the latest changes.
-rw-r--r--libvo/vo_corevideo.m4
-rw-r--r--libvo/vo_sharedbuffer.m2
2 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index 6e7699ef82..1d10330bcb 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -232,7 +232,7 @@ static void draw_osd(struct vo *vo, struct osd_state *osd_s)
struct osd_p *osd = p->osd;
GL *gl = p->mpglctx->gl;
- if (vo_osd_has_changed()) {
+ if (vo_osd_has_changed(osd_s)) {
clearOSD(vo);
osd_draw_text_ext(osd_s, vo->dwidth, vo->dheight, 0, 0, 0, 0,
p->image_width, p->image_height, create_osd_texture,
@@ -465,5 +465,5 @@ const struct vo_driver video_out_corevideo = {
.flip_page = flip_page,
.check_events = check_events,
.uninit = uninit,
- .privsize = sizeof(struct priv),
+ .priv_size = sizeof(struct priv),
};
diff --git a/libvo/vo_sharedbuffer.m b/libvo/vo_sharedbuffer.m
index 40aa170864..219ad91474 100644
--- a/libvo/vo_sharedbuffer.m
+++ b/libvo/vo_sharedbuffer.m
@@ -261,7 +261,7 @@ const struct vo_driver video_out_sharedbuffer = {
.check_events = check_events,
.uninit = uninit,
.draw_osd = draw_osd,
- .privsize = sizeof(struct priv),
+ .priv_size = sizeof(struct priv),
.options = (const struct m_option[]) {
OPT_STRING("buffer_name", buffer_name, 0, OPTDEF_STR("mplayerosx")),
{NULL},