Mercurial > mplayer.hg
comparison libvo/sub.c @ 21581:37c795807a1d
Another simplification
author | reimar |
---|---|
date | Mon, 11 Dec 2006 22:32:13 +0000 |
parents | 8a710a7b68ea |
children | 239f2c145b2f |
comparison
equal
deleted
inserted
replaced
21580:8a710a7b68ea | 21581:37c795807a1d |
---|---|
381 // vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)) | 381 // vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)) |
382 | 382 |
383 inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ | 383 inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ |
384 unsigned char *t; | 384 unsigned char *t; |
385 int c,i,j,l,x,y,font,prevc,counter; | 385 int c,i,j,l,x,y,font,prevc,counter; |
386 int len; | |
387 int k; | 386 int k; |
388 int lastStripPosition; | 387 int lastStripPosition; |
389 int xsize; | 388 int xsize; |
390 int xmin=dxs,xmax=0; | 389 int xmin=dxs,xmax=0; |
391 int h,lasth; | 390 int h,lasth; |
415 | 414 |
416 while (l) { | 415 while (l) { |
417 xsize = -vo_font->charspace; | 416 xsize = -vo_font->charspace; |
418 l--; | 417 l--; |
419 t=vo_sub->text[i++]; | 418 t=vo_sub->text[i++]; |
420 len=strlen(t)-1; | |
421 char_position = 0; | 419 char_position = 0; |
422 char_seq = (int *) malloc((len + 1) * sizeof(int)); | 420 char_seq = calloc(strlen(t), sizeof(int)); |
423 | 421 |
424 prevc = -1; | 422 prevc = -1; |
425 | 423 |
426 otp = NULL; | 424 otp = NULL; |
427 osl = NULL; | 425 osl = NULL; |