summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-25 13:33:43 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-25 13:33:43 +0000
commit331903088d5a1309e64d080c9324e62652d97250 (patch)
tree12f6c1871db6ddde1e4000fd92f8aa7273ec4d78
parent39a90116a6eadcde6094ebf9ca42633f8671d82b (diff)
downloadmpv-331903088d5a1309e64d080c9324e62652d97250.tar.bz2
mpv-331903088d5a1309e64d080c9324e62652d97250.tar.xz
added support for output of subtitles - Juergen Hammelmann <juergen.hammelmann@gmx.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5833 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/vo_yuv4mpeg.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c
index 012ca60479..a934d5c17a 100644
--- a/libvo/vo_yuv4mpeg.c
+++ b/libvo/vo_yuv4mpeg.c
@@ -8,6 +8,11 @@
*
* This is undoubtedly incomplete, inaccurate, or just plain wrong. :-)
*
+ *
+ * 2002/04/17 Juergen Hammelmann <juergen.hammelmann@gmx.de>
+ * - added support for output of subtitles
+ * best, if you give option '-osdlevel 0' to mplayer for
+ * no watching the seek+timer
*/
#include <stdio.h>
@@ -21,6 +26,8 @@
#include "video_out.h"
#include "video_out_internal.h"
+#include "sub.h"
+
#include "fastmemcpy.h"
#include "../postproc/rgb2rgb.h"
@@ -81,8 +88,18 @@ static const vo_info_t* get_info(void)
return &vo_info;
}
+static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
+ unsigned char *srca, int stride) {
+ if(using_format == IMGFMT_YV12)
+ {
+ vo_draw_alpha_yv12(w, h, src, srca, stride,
+ image+(y0*image_width+x0), image_width);
+ }
+}
+
static void draw_osd(void)
{
+ vo_draw_text(image_width, image_height, draw_alpha);
}
static void flip_page (void)