summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-15 13:38:15 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-18 14:35:18 +0200
commitdde62cee8e854407d753c95ef65b9f8768ee17c6 (patch)
tree53b151672bc14228c405f9aca1dbb5c2c1807cfd /ext
parenta317f6936ca1d5bc52de4e6b5ef33f2fc20e8ed2 (diff)
eglglessink: Fix crashes if there are no EGL or GLES extensions
Diffstat (limited to 'ext')
-rw-r--r--ext/eglgles/gsteglglessink.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c
index 60666d548..58bf81120 100644
--- a/ext/eglgles/gsteglglessink.c
+++ b/ext/eglgles/gsteglglessink.c
@@ -1244,8 +1244,8 @@ gst_eglglessink_init_egl_exts (GstEglGlesSink * eglglessink)
eglexts = eglQueryString (eglglessink->eglglesctx->display, EGL_EXTENSIONS);
glexts = glGetString (GL_EXTENSIONS);
- GST_DEBUG_OBJECT (eglglessink, "Available EGL extensions: %s\n", eglexts);
- GST_DEBUG_OBJECT (eglglessink, "Available GLES extensions: %s\n", glexts);
+ GST_DEBUG_OBJECT (eglglessink, "Available EGL extensions: %s\n", GST_STR_NULL (eglexts));
+ GST_DEBUG_OBJECT (eglglessink, "Available GLES extensions: %s\n", GST_STR_NULL ((const char *) glexts));
#ifdef EGL_FAST_RENDERING_POSSIBLE
/* OK Fast rendering should be possible from the declared
@@ -1254,11 +1254,11 @@ gst_eglglessink_init_egl_exts (GstEglGlesSink * eglglessink)
/* Check for support from claimed EGL/GLES extensions */
- if (!strstr (eglexts, "EGL_KHR_image"))
+ if (!eglexts || !strstr (eglexts, "EGL_KHR_image"))
goto KHR_IMAGE_NA;
- if (!strstr (eglexts, "EGL_KHR_lock_surface"))
+ if (!eglexts || !strstr (eglexts, "EGL_KHR_lock_surface"))
goto SURFACE_LOCK_NA;
- if (!strstr ((char *) glexts, "GL_OES_EGL_image"))
+ if (!glexts || !strstr ((char *) glexts, "GL_OES_EGL_image"))
goto TEXTURE_2DOES_NA;
/* Check for actual extension proc addresses */