[vlc-commits] vout: ios2: sys->vgl can be null

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov 30 11:09:40 2016 +0100| [d83bd182f7492e1687083a515ab364bf590c8fc6] | committer: Thomas Guillem

vout: ios2: sys->vgl can be null

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

 modules/video_output/ios2.m | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 061f186..d99b91d 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -418,7 +418,8 @@ static int Control(vout_display_t *vd, int query, va_list ap)
                     sys->place = place;
                 }
 
-                vout_display_opengl_SetWindowAspectRatio(sys->vgl, (float)place.width / place.height);
+                if (sys->gl.sys != NULL)
+                    vout_display_opengl_SetWindowAspectRatio(sys->vgl, (float)place.width / place.height);
 
                 // x / y are top left corner, but we need the lower left one
                 if (query != VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
@@ -428,8 +429,11 @@ static int Control(vout_display_t *vd, int query, va_list ap)
         }
 
         case VOUT_DISPLAY_CHANGE_VIEWPOINT:
-            return vout_display_opengl_SetViewpoint(sys->vgl,
-                &va_arg (ap, const vout_display_cfg_t* )->viewpoint);
+            if (sys->gl.sys != NULL)
+                return vout_display_opengl_SetViewpoint(sys->vgl,
+                    &va_arg (ap, const vout_display_cfg_t* )->viewpoint);
+            else
+                return VLC_EGENERIC;
 
         case VOUT_DISPLAY_RESET_PICTURES:
             vlc_assert_unreachable ();