diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libvo/old_vo_wrapper.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libvo/old_vo_wrapper.c')
-rw-r--r-- | libvo/old_vo_wrapper.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libvo/old_vo_wrapper.c b/libvo/old_vo_wrapper.c index 57d1145f53..bdbc8b8349 100644 --- a/libvo/old_vo_wrapper.c +++ b/libvo/old_vo_wrapper.c @@ -99,6 +99,17 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, osd_draw_text(global_osd, dxs, dys, draw_alpha_wrapper, draw_alpha); } +void vo_draw_text_ext(int dxs, int dys, int left_border, int top_border, + int right_border, int bottom_border, int orig_w, int orig_h, + void (*draw_alpha)(int x0, int y0, int w,int h, + unsigned char* src, + unsigned char *srca, int stride)) +{ + osd_draw_text_ext(global_osd, dxs, dys, left_border, top_border, + right_border, bottom_border, orig_w, orig_h, + draw_alpha_wrapper, draw_alpha); +} + int vo_update_osd(int dxs, int dys) { return osd_update(global_osd, dxs, dys); |