[Mplayer-cvslog] CVS: 0_90/libvo vo_directx.c,1.13,1.14

Sascha Sommer CVS faust3 at mplayerhq.hu
Fri Apr 11 18:45:32 CEST 2003


Update of /cvsroot/mplayer/0_90/libvo
In directory mail:/var/tmp.root/cvs-serv632/libvo

Modified Files:
	vo_directx.c 
Log Message:
backport 10ls

Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/libvo/vo_directx.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_directx.c	22 Mar 2003 16:31:05 -0000	1.13
+++ vo_directx.c	11 Apr 2003 16:45:30 -0000	1.14
@@ -28,7 +28,7 @@
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
 #include "../input/input.h"
-#include "../linux/keycodes.h"
+#include "../osdep/keycodes.h"
 #include "../mp_msg.h"
 #include "aspect.h"
 
@@ -786,7 +786,7 @@
 		        case VK_HOME:
 					{mplayer_put_key(KEY_HOME);break;}
 		        case VK_END:
-					{mplayer_put_key(VK_END);break;}
+					{mplayer_put_key(KEY_END);break;}
 		        case VK_PRIOR:
 			        {mplayer_put_key(KEY_PAGE_UP);break;}
 		        case VK_NEXT:
@@ -1100,7 +1100,8 @@
 	if (!nooverlay && Directx_CreateOverlay(image_format))
 	{
 			nooverlay=1; /*overlay creation failed*/
-			mp_msg(MSGT_VO, MSGL_V,"<vo_directx><WARN>can't use overlay mode => switching to nonoverlay\n");
+			mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't use overlay mode: please use -vo directx:noaccel\n");
+			return 1;
 	}
 	if(nooverlay)
 	{



More information about the MPlayer-cvslog mailing list