[Mplayer-cvslog] CVS: main/libvo vo_yuv4mpeg.c,1.7,1.8

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv23972

Modified Files:
	vo_yuv4mpeg.c 
Log Message:
added support for output of subtitles - Juergen Hammelmann <juergen.hammelmann at gmx.de>

Index: vo_yuv4mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_yuv4mpeg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_yuv4mpeg.c	25 Apr 2002 13:33:02 -0000	1.7
+++ vo_yuv4mpeg.c	25 Apr 2002 13:33:43 -0000	1.8
@@ -8,6 +8,11 @@
  *
  * This is undoubtedly incomplete, inaccurate, or just plain wrong. :-)
  *
+ *
+ * 2002/04/17 Juergen Hammelmann <juergen.hammelmann at 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 @@
     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)