diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/sub.c | 12 | ||||
| -rw-r--r-- | libvo/sub.h | 1 | ||||
| -rw-r--r-- | libvo/video_out.h | 1 |
3 files changed, 2 insertions, 12 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 00780cf7ce..5e44238121 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -390,12 +390,6 @@ int vo_update_osd(int dxs,int dys){ else obj->flags&=~OSDFLAG_VISIBLE; break; - case OSDTYPE_VOBSUB: - if(vo_vobsub) - obj->flags|=OSDFLAG_VISIBLE|OSDFLAG_CHANGED; - else - obj->flags&=~OSDFLAG_VISIBLE; - break; case OSDTYPE_OSD: if(vo_font && vo_osd_text && vo_osd_text[0]){ vo_update_text_osd(obj,dxs,dys); // update bbox @@ -443,13 +437,12 @@ void vo_init_osd(){ draw_alpha_init_flag=1; vo_draw_alpha_init(); } - if(vo_osd_list) free_osd_list; + if(vo_osd_list) free_osd_list(); // temp hack, should be moved to mplayer/mencoder later new_osd_obj(OSDTYPE_OSD); new_osd_obj(OSDTYPE_SUBTITLE); new_osd_obj(OSDTYPE_PROGBAR); new_osd_obj(OSDTYPE_SPU); - new_osd_obj(OSDTYPE_VOBSUB); } int vo_osd_changed_flag=0; @@ -482,9 +475,6 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, case OSDTYPE_SPU: spudec_draw_scaled(vo_spudec, dxs, dys, draw_alpha); // FIXME break; - case OSDTYPE_VOBSUB: - vobsub_draw(vo_vobsub, dxs, dys, draw_alpha); // FIXME - break; case OSDTYPE_OSD: vo_draw_text_osd(obj,draw_alpha); break; diff --git a/libvo/sub.h b/libvo/sub.h index 21482eea80..c15a2a99d0 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -10,7 +10,6 @@ typedef struct mp_osd_bbox_s { #define OSDTYPE_SUBTITLE 2 #define OSDTYPE_PROGBAR 3 #define OSDTYPE_SPU 4 -#define OSDTYPE_VOBSUB 5 #define OSDFLAG_VISIBLE 1 #define OSDFLAG_CHANGED 2 diff --git a/libvo/video_out.h b/libvo/video_out.h index 62b20a3a60..1490048c72 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -39,6 +39,7 @@ /* libmpcodecs direct rendering: */ #define VOCTRL_GET_IMAGE 9 #define VOCTRL_DRAW_IMAGE 13 +#define VOCTRL_SET_SPU_PALETTE 14 /* decoding ahead: */ #define VOCTRL_GET_NUM_FRAMES 10 #define VOCTRL_GET_FRAME_NUM 11 |