Make DirectX default on XP, instead of Direct3d

We did that for 2.0 temporarily but kept master normal

This is still broken on some weird configurations, so well, temporary is
going to last..

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 73de215f1ccaade12756bd4c4569ba10382b9117..0b664c4d71f9935ff5151263778fcf859b458075 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -142,6 +142,11 @@ static int Open(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys;
 
+    OSVERSIONINFO winVer;
+    winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if(GetVersionEx(&winVer) && winVer.dwMajorVersion < 6 && !object->b_force)
+        return VLC_EGENERIC;
+
     /* Allocate structure */
     vd->sys = sys = calloc(1, sizeof(vout_display_sys_t));
     if (!sys)