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.

1 files changed, 8 insertions, 0 deletions

diff --git a/libvo/sub.h b/libvo/sub.h
index 879e81e33a..83a2f87dbd 100644
--- a/libvo/sub.h
+++ b/libvo/sub.h
@@ -112,6 +112,14 @@ void osd_draw_text(struct osd_state *osd, int dxs, int dys,
                                       unsigned char* src, unsigned char *srca,
                                       int stride),
                    void *ctx);
+void osd_draw_text_ext(struct osd_state *osd, 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)(void *ctx, int x0, int y0, int w,
+                                          int h, unsigned char* src,
+                                          unsigned char *srca,
+                                          int stride),
+                       void *ctx);
 void osd_remove_text(struct osd_state *osd, int dxs, int dys,
                      void (*remove)(int x0, int y0, int w, int h));