[vlc-commits] Make DirectX default on XP, instead of Direct3d

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 12 13:04:35 2013 +0100| [9dae581372c5d7b714fd005c5fed6d74e701d889] | committer: Jean-Baptiste Kempf

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..

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9dae581372c5d7b714fd005c5fed6d74e701d889
---

 modules/video_output/msw/direct3d.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 73de215..0b664c4 100644
--- 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)