summaryrefslogtreecommitdiffstats
path: root/libvo/vosub_vidix.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-09 00:47:26 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-09 00:47:26 +0000
commit7c51652a1ba60b6a102eae0c76562234e30d83be (patch)
treedd6402878602d5b9703fc573564d689e300ef2f6 /libvo/vosub_vidix.c
parent73fb8576e423b1c555cf1fcf8898168cff6f9294 (diff)
downloadmpv-7c51652a1ba60b6a102eae0c76562234e30d83be.tar.bz2
mpv-7c51652a1ba60b6a102eae0c76562234e30d83be.tar.xz
query_ stuff replaced by new control() - patch by David Holm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vosub_vidix.c')
-rw-r--r--libvo/vosub_vidix.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index ccd5e800d8..cbcc6cc393 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -627,6 +627,18 @@ int vidix_init(unsigned src_width,unsigned src_height,
return 0;
}
+uint32_t vidix_control(uint32_t request, void *data, ...)
+{
+ switch (request) {
+ case VOCTRL_QUERY_VAA:
+ vidix_query_vaa((vo_vaa_t*)data);
+ return VO_TRUE;
+ case VOCTRL_QUERY_FORMAT:
+ return vidix_query_fourcc(*((uint32_t*)data));
+ }
+ return VO_NOTIMPL;
+}
+
int vidix_preinit(const char *drvname,void *server)
{
int err;
@@ -656,8 +668,7 @@ int vidix_preinit(const char *drvname,void *server)
((vo_functions_t *)server)->draw_frame=vidix_draw_frame;
((vo_functions_t *)server)->flip_page=vidix_flip_page;
((vo_functions_t *)server)->draw_osd=vidix_draw_osd;
- ((vo_functions_t *)server)->query_format=vidix_query_fourcc;
- ((vo_functions_t *)server)->query_vaa=vidix_query_vaa;
+ ((vo_functions_t *)server)->control=vidix_control;
vo_server = server;
return 0;
}