diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-17 10:27:51 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:16:55 +0200 |
| commit | 14c22f8236d8624d9fdf29882d2e3fec5a421db4 (patch) | |
| tree | f0f18b2301fb393ab6e1d4489a281e3a5365f27c | |
| parent | 03e539f38c476f1c4e11d045f01ac2cb23f3c4a6 (diff) | |
| download | mpv-14c22f8236d8624d9fdf29882d2e3fec5a421db4.tar.bz2 mpv-14c22f8236d8624d9fdf29882d2e3fec5a421db4.tar.xz | |
vesa_lvo.c: Move vlvo_preinit() below the functions that it uses
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32287 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/vesa_lvo.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c index 881a8443eb..fa525d321d 100644 --- a/libvo/vesa_lvo.c +++ b/libvo/vesa_lvo.c @@ -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 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, unsigned x_org,unsigned y_org,unsigned dst_width, unsigned dst_height,unsigned format,unsigned dest_bpp) @@ -307,6 +284,29 @@ void vlvo_draw_osd(void) #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) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { |