[Mplayer-cvslog] CVS: main/libvo vo_dxr3.c,1.115,1.116

[David Holm CVS]

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

Modified Files:
	vo_dxr3.c 
Log Message:
Added patch from Tamas Kohegyi to fix subpic placement with freetype

Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- vo_dxr3.c	2 Jan 2003 23:57:38 -0000	1.115
+++ vo_dxr3.c	12 Jan 2003 19:32:56 -0000	1.116
@@ -1,11 +1,14 @@
 /*
  * vo_dxr3.c - DXR3/H+ video out
  *
- * Copyright (C) 2002 David Holm <dholm at iname.com>
+ * Copyright (C) 2002-2003 David Holm <david at realityrift.com>
  *
  */
 
 /* ChangeLog added 2002-01-10
+ * 2003-01-12:
+ *  Added patch from Tamas Kohegyi to fix subpic placement with freetype.
+ *
  * 2003-01-02:
  *  Added patch from Jens Axboe that makes vo_dxr3 return to previous TV norm
  *   after quiting.
@@ -527,7 +530,11 @@
 
 #ifdef SPU_SUPPORT
 #ifdef HAVE_FREETYPE
-	s_width*=1.5;
+	if (ioval == EM8300_ASPECTRATIO_16_9) {
+		s_width *= 1.5;
+	} else {
+		s_width *= 0.84;
+	}
 #else
 	s_width*=2;
 	s_height*=2;