summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-04 16:24:18 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:39:31 +0100
commit58d3469fd6e983887a64afc51e0611504b749b3e (patch)
treed86f179247720d6b88be1e5522edcf7d530d7375 /video/out/vo_opengl.c
parent191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30 (diff)
downloadmpv-58d3469fd6e983887a64afc51e0611504b749b3e.tar.bz2
mpv-58d3469fd6e983887a64afc51e0611504b749b3e.tar.xz
video/out: replace VOCTRL_QUERY_FORMAT with vo_driver.query_format
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r--video/out/vo_opengl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index dfd368fb3e..9403d7472e 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -1660,7 +1660,7 @@ static bool init_format(int fmt, struct gl_priv *init)
return true;
}
-static int query_format(uint32_t format)
+static int query_format(struct vo *vo, uint32_t format)
{
int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIP |
VFCAP_ACCEPT_STRIDE | VFCAP_OSD;
@@ -1735,8 +1735,6 @@ static int control(struct vo *vo, uint32_t request, void *data)
struct gl_priv *p = vo->priv;
switch (request) {
- case VOCTRL_QUERY_FORMAT:
- return query_format(*(uint32_t *)data);
case VOCTRL_ONTOP:
if (!p->glctx->ontop)
break;
@@ -2257,6 +2255,7 @@ const struct vo_driver video_out_opengl = {
""
},
.preinit = preinit,
+ .query_format = query_format,
.config = config,
.control = control,
.draw_image = draw_image,
@@ -2275,6 +2274,7 @@ const struct vo_driver video_out_opengl_hq = {
""
},
.preinit = preinit,
+ .query_format = query_format,
.config = config,
.control = control,
.draw_image = draw_image,