diff options
| author | wm4 <wm4@nowhere> | 2012-08-18 12:03:40 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-20 15:36:05 +0200 |
| commit | 988dad5fc7f13d7be266b139ddf29a8c8c9a3d02 (patch) | |
| tree | c7c0372d295795f0a2546140c5989e8891819328 | |
| parent | 4adc0064db54b9c8d68adb038c3526018c544648 (diff) | |
| download | mpv-988dad5fc7f13d7be266b139ddf29a8c8c9a3d02.tar.bz2 mpv-988dad5fc7f13d7be266b139ddf29a8c8c9a3d02.tar.xz | |
osd: get rid of useless initialization function
The function merely printed redundant messages that were not visible by
default.
| -rw-r--r-- | libvo/osd.c | 18 | ||||
| -rw-r--r-- | libvo/osd.h | 2 | ||||
| -rw-r--r-- | sub/sub.c | 10 |
3 files changed, 1 insertions, 29 deletions
diff --git a/libvo/osd.c b/libvo/osd.c index 9adcc3f664..2fd294a13a 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -153,24 +153,6 @@ void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, i #endif } -void vo_draw_alpha_init(void){ -//FIXME the optimized stuff is a lie for 15/16bpp as they aren't optimized yet - if( mp_msg_test(MSGT_OSD,MSGL_V) ) - { -#if ARCH_X86 - // ordered per speed fasterst first - if(gCpuCaps.hasMMX2) - mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n"); - else if(gCpuCaps.hasMMX) - mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n"); - else - mp_msg(MSGT_OSD,MSGL_INFO,"Using X86 Optimized OnScreenDisplay\n"); -#else - mp_msg(MSGT_OSD,MSGL_INFO,"Using Unoptimized OnScreenDisplay\n"); -#endif - } -} - void vo_draw_alpha_rgb12(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride) { int y; diff --git a/libvo/osd.h b/libvo/osd.h index 8f57e6b444..4e8064a93f 100644 --- a/libvo/osd.h +++ b/libvo/osd.h @@ -22,8 +22,6 @@ #ifndef MPLAYER_OSD_H #define MPLAYER_OSD_H -void vo_draw_alpha_init(void); // build tables - void vo_draw_alpha_yv12(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride); void vo_draw_alpha_yuy2(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride); void vo_draw_alpha_rgb24(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride); @@ -137,11 +137,7 @@ inline static void vo_draw_spudec_sub(mp_osd_obj_t* obj, void (*draw_alpha)(void void *vo_spudec=NULL; void *vo_vobsub=NULL; -static int draw_alpha_init_flag=0; - -void vo_draw_alpha_init(void); - - mp_osd_obj_t* vo_osd_list=NULL; +mp_osd_obj_t* vo_osd_list=NULL; static mp_osd_obj_t* new_osd_obj(int type){ mp_osd_obj_t* osd=malloc(sizeof(mp_osd_obj_t)); @@ -255,10 +251,6 @@ struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib) .opts = opts, .ass_library = asslib, }; - if(!draw_alpha_init_flag){ - draw_alpha_init_flag=1; - vo_draw_alpha_init(); - } // temp hack, should be moved to mplayer later new_osd_obj(OSDTYPE_OSD); new_osd_obj(OSDTYPE_SUBTITLE); |