From 09549536819f6835fb293bea24b585ceea04b072 Mon Sep 17 00:00:00 2001 From: arpi Date: Thu, 7 Mar 2002 01:51:28 +0000 Subject: [PATCH] control+preinit moved to mga_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4971 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/mga_common.c | 16 ++++++++++++++++ libvo/vo_mga.c | 13 ------------- libvo/vo_xmga.c | 13 ------------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 6bfbd3de8a..9772b78bd5 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -200,6 +200,16 @@ query_format(uint32_t format) return 0; } +static uint32_t control(uint32_t request, void *data, ...) +{ + switch (request) { + case VOCTRL_QUERY_FORMAT: + return query_format(*((uint32_t*)data)); + } + return VO_NOTIMPL; +} + + static int mga_init(){ char *frame_mem; @@ -232,3 +242,9 @@ static int mga_uninit(){ munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames); close(f); } + +static uint32_t preinit(const char *arg) +{ + return 0; +} + diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c index 26a95b8aaf..210cb525ad 100644 --- a/libvo/vo_mga.c +++ b/libvo/vo_mga.c @@ -169,16 +169,3 @@ static void check_events(void) { } -static uint32_t preinit(const char *arg) -{ - return 0; -} - -static uint32_t control(uint32_t request, void *data, ...) -{ - switch (request) { - case VOCTRL_QUERY_FORMAT: - return query_format(*((uint32_t*)data)); - } - return VO_NOTIMPL; -} diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index bbe27b4d39..2f90b6f59c 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -373,16 +373,3 @@ uninit(void) printf("vo: uninit!\n"); } -static uint32_t preinit(const char *arg) -{ - return 0; -} - -static uint32_t control(uint32_t request, void *data, ...) -{ - switch (request) { - case VOCTRL_QUERY_FORMAT: - return query_format(*((uint32_t*)data)); - } - return VO_NOTIMPL; -}