diff --git a/libvo/sub.c b/libvo/sub.c index 610b0d48c0..c16c56f8f5 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -187,35 +187,6 @@ inline static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,in memy-=vo_font->height; xsize=lastxsize=-vo_font->charspace; } - xsize+=w+vo_font->charspace; - if ((dxs0) || j==len-1) - { - if (j==len-1) lastStripPosition=len; - else xsize=lastxsize; - j=lastStripPosition; - - x=dxs/2-xsize/2; - - for(k=previousStrip;k=0x80)) c=(c<<8)+text[++k]; - font=vo_font->font[c]; - if(x>=0 && x+vo_font->width[c]=0) - draw_alpha(x,y, - vo_font->width[c], - vo_font->pic_a[font]->h, - vo_font->pic_b[font]->bmp+vo_font->start[c], - vo_font->pic_a[font]->bmp+vo_font->start[c], - vo_font->pic_a[font]->w); - x+=vo_font->width[c]+vo_font->charspace; - } - x=0; - y+=vo_font->height; - previousStrip=lastStripPosition; - xsize=lastxsize=-vo_font->charspace; - } } } diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h index 9c8aa733a3..1cf94f2ad7 100644 --- a/libvo/video_out_internal.h +++ b/libvo/video_out_internal.h @@ -25,6 +25,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t static const vo_info_t* get_info(void); static uint32_t draw_frame(uint8_t *src[]); static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y); +static void draw_osd(void); static void flip_page(void); static void check_events(void); static void uninit(void); diff --git a/libvo/vo_odivx.c b/libvo/vo_odivx.c index 5abf4f26f6..8e2201e939 100644 --- a/libvo/vo_odivx.c +++ b/libvo/vo_odivx.c @@ -137,6 +137,10 @@ typedef struct DWORD dwChunkLength; // Length of chunk } AVIINDEXENTRY; +static void draw_osd(void) +{ +} + static void flip_page(void) { diff --git a/libvo/vo_pgm.c b/libvo/vo_pgm.c index 59fa446927..20caa410ee 100644 --- a/libvo/vo_pgm.c +++ b/libvo/vo_pgm.c @@ -58,6 +58,10 @@ get_info(void) return &vo_info; } +static void draw_osd(void) +{ +} + static void flip_page (void) { FILE * f;