Mercurial > mplayer.hg
changeset 32203:42536d4a06a8
cosmetics: Move vlvo_preinit() below the functions that it uses.
| author | diego |
|---|---|
| date | Fri, 17 Sep 2010 10:27:51 +0000 |
| parents | 6c9a3a4c93a7 |
| children | 0a81c931ecb5 |
| files | libvo/vesa_lvo.c |
| diffstat | 1 files changed, 24 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vesa_lvo.c Fri Sep 17 10:11:24 2010 +0000 +++ b/libvo/vesa_lvo.c Fri Sep 17 10:27:51 2010 +0000 @@ -60,29 +60,6 @@ #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) ) #define IMAGE_LINE_SIZE(pixel_size) (image_width*(pixel_size)) -extern vo_functions_t video_out_vesa; - -int vlvo_preinit(const char *drvname) -{ - mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported); - 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_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_VESA_CouldntOpen,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) @@ -308,6 +285,30 @@ #endif } +extern vo_functions_t video_out_vesa; + +int vlvo_preinit(const char *drvname) +{ + mp_msg(MSGT_VO, MSGL_WARN, MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported); + 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_msg(MSGT_VO, MSGL_WARN, MSGTR_LIBVO_VESA_CouldntOpen, 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) ) {