RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

vesa_lvo.c: Move vlvo_preinit() below the functions that it uses

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32287 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-09-17 10:27:51 +00:00 committed by Uoti Urpala
parent 03e539f38c
commit 14c22f8236
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libvo/vesa_lvo.c
View File

@ -59,29 +59,6 @@ int vlvo_control(uint32_t request, void *data);
#define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) ) #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) )
#define IMAGE_LINE_SIZE(pixel_size) (image_width*(pixel_size)) #define IMAGE_LINE_SIZE(pixel_size) (image_width*(pixel_size))
extern struct vo_old_functions video_out_vesa;
int vlvo_preinit(const char *drvname)
{
mp_tmsg(MSGT_VO,MSGL_WARN, "[VESA_LVO] This branch is no longer supported.\n[VESA_LVO] Please use -vo vesa:vidix instead.\n");
return -1;
if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_preinit(%s) was called\n",drvname);}
lvo_handler = open(drvname,O_RDWR);
if(lvo_handler == -1)
{
mp_tmsg(MSGT_VO,MSGL_WARN, "[VESA_LVO] Couldn't open: '%s'\n",drvname);
return -1;
}
/* we are able to tune up this stuff depend on fourcc format */
video_out_vesa.draw_slice=vlvo_draw_slice;
video_out_vesa.draw_frame=vlvo_draw_frame;
video_out_vesa.flip_page=vlvo_flip_page;
video_out_vesa.draw_osd=vlvo_draw_osd;
video_out_vesa.control=vlvo_control;
return 0;
}
int vlvo_init(unsigned src_width,unsigned src_height, int vlvo_init(unsigned src_width,unsigned src_height,
unsigned x_org,unsigned y_org,unsigned dst_width, unsigned x_org,unsigned y_org,unsigned dst_width,
unsigned dst_height,unsigned format,unsigned dest_bpp) unsigned dst_height,unsigned format,unsigned dest_bpp)
@ -307,6 +284,29 @@ void vlvo_draw_osd(void)
#endif #endif
} }
extern struct vo_old_functions video_out_vesa;
int vlvo_preinit(const char *drvname)
{
mp_tmsg(MSGT_VO,MSGL_WARN, "[VESA_LVO] This branch is no longer supported.\n[VESA_LVO] Please use -vo vesa:vidix instead.\n");
return -1;
if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
mp_msg(MSGT_VO,MSGL_DBG2, "vesa_lvo: vlvo_preinit(%s) was called\n",drvname);}
lvo_handler = open(drvname,O_RDWR);
if(lvo_handler == -1)
{
mp_tmsg(MSGT_VO,MSGL_WARN, "[VESA_LVO] Couldn't open: '%s'\n",drvname);
return -1;
}
/* we are able to tune up this stuff depend on fourcc format */
video_out_vesa.draw_slice=vlvo_draw_slice;
video_out_vesa.draw_frame=vlvo_draw_frame;
video_out_vesa.flip_page=vlvo_flip_page;
video_out_vesa.draw_osd=vlvo_draw_osd;
video_out_vesa.control=vlvo_control;
return 0;
}
uint32_t vlvo_query_info(uint32_t format) uint32_t vlvo_query_info(uint32_t format)
{ {
if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {