summaryrefslogtreecommitdiffstats
path: root/video/out/vo_caca.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_caca.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_caca.c')
-rw-r--r--video/out/vo_caca.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index 3c7614c195..a8a312d01a 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -355,7 +355,7 @@ static int preinit(struct vo *vo, const char *arg)
return 0;
}
-static int query_format(uint32_t format)
+static int query_format(struct vo *vo, uint32_t format)
{
if (format == IMGFMT_BGR24)
return VFCAP_OSD | VFCAP_CSP_SUPPORTED;
@@ -365,12 +365,7 @@ static int query_format(uint32_t format)
static int control(struct vo *vo, uint32_t request, void *data)
{
- switch (request) {
- case VOCTRL_QUERY_FORMAT:
- return query_format(*((uint32_t *)data));
- default:
- return VO_NOTIMPL;
- }
+ return VO_NOTIMPL;
}
const struct vo_driver video_out_caca = {
@@ -381,6 +376,7 @@ const struct vo_driver video_out_caca = {
""
},
.preinit = preinit,
+ .query_format = query_format,
.config = config,
.control = control,
.draw_image = draw_image,