[vlc-commits] Win32: fix video output compilations

Jean-Baptiste Kempf git at videolan.org
Sat Jun 18 19:28:31 CEST 2016


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jun 18 19:27:36 2016 +0200| [6c4e9a8ff041e117cfd69788df0d5b48fe51a9f0] | committer: Jean-Baptiste Kempf

Win32: fix video output compilations

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

 modules/video_output/win32/direct2d.c   |    2 +-
 modules/video_output/win32/direct3d9.c  |    2 +-
 modules/video_output/win32/win32touch.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/win32/direct2d.c b/modules/video_output/win32/direct2d.c
index 277ce36..0e489b8 100644
--- a/modules/video_output/win32/direct2d.c
+++ b/modules/video_output/win32/direct2d.c
@@ -91,7 +91,7 @@ static int Open(vlc_object_t *object)
 
     sys->d2_dll = LoadLibrary(TEXT("D2D1.DLL"));
     if (!sys->d2_dll) {
-        if (object->b_force)
+        if (object->obj.force)
             msg_Err(vd, "Cannot load D2D1.DLL, aborting");
         goto error;
     }
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index a0ffc05..3058e3c 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -163,7 +163,7 @@ static int Open(vlc_object_t *object)
 
     OSVERSIONINFO winVer;
     winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    if(GetVersionEx(&winVer) && winVer.dwMajorVersion < 6 && !object->b_force)
+    if(GetVersionEx(&winVer) && winVer.dwMajorVersion < 6 && !object->obj.force)
         return VLC_EGENERIC;
 
     /* Allocate structure */
diff --git a/modules/video_output/win32/win32touch.c b/modules/video_output/win32/win32touch.c
index 0b5a6ef..0e0846a 100644
--- a/modules/video_output/win32/win32touch.c
+++ b/modules/video_output/win32/win32touch.c
@@ -136,7 +136,7 @@ LRESULT DecodeGesture( vlc_object_t *p_this, win32_gesture_sys_t *p_gesture,
                 break;
             case GID_TWOFINGERTAP:
                 p_gesture->i_type = GID_TWOFINGERTAP;
-                var_SetInteger( p_this->ovj.libvlc, "key-action", ACTIONID_PLAY_PAUSE );
+                var_SetInteger( p_this->obj.libvlc, "key-action", ACTIONID_PLAY_PAUSE );
                 bHandled = TRUE;
                 break;
             case GID_ZOOM:



More information about the vlc-commits mailing list