mirror of https://github.com/mpv-player/mpv
osd: get rid of useless initialization function
The function merely printed redundant messages that were not visible by default.
This commit is contained in:
parent
4adc0064db
commit
988dad5fc7
18
libvo/osd.c
18
libvo/osd.c
|
@ -153,24 +153,6 @@ void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, i
|
||||||
#endif
|
#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,
|
void vo_draw_alpha_rgb12(int w, int h, unsigned char* src, unsigned char *srca,
|
||||||
int srcstride, unsigned char* dstbase, int dststride) {
|
int srcstride, unsigned char* dstbase, int dststride) {
|
||||||
int y;
|
int y;
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
#ifndef MPLAYER_OSD_H
|
#ifndef MPLAYER_OSD_H
|
||||||
#define 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_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_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);
|
void vo_draw_alpha_rgb24(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);
|
||||||
|
|
10
sub/sub.c
10
sub/sub.c
|
@ -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_spudec=NULL;
|
||||||
void *vo_vobsub=NULL;
|
void *vo_vobsub=NULL;
|
||||||
|
|
||||||
static int draw_alpha_init_flag=0;
|
mp_osd_obj_t* vo_osd_list=NULL;
|
||||||
|
|
||||||
void vo_draw_alpha_init(void);
|
|
||||||
|
|
||||||
mp_osd_obj_t* vo_osd_list=NULL;
|
|
||||||
|
|
||||||
static mp_osd_obj_t* new_osd_obj(int type){
|
static mp_osd_obj_t* new_osd_obj(int type){
|
||||||
mp_osd_obj_t* osd=malloc(sizeof(mp_osd_obj_t));
|
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,
|
.opts = opts,
|
||||||
.ass_library = asslib,
|
.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
|
// temp hack, should be moved to mplayer later
|
||||||
new_osd_obj(OSDTYPE_OSD);
|
new_osd_obj(OSDTYPE_OSD);
|
||||||
new_osd_obj(OSDTYPE_SUBTITLE);
|
new_osd_obj(OSDTYPE_SUBTITLE);
|
||||||
|
|
Loading…
Reference in New Issue