diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2014-04-02 22:53:10 +1100 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2014-04-02 22:53:10 +1100 |
| commit | 7d2d3b3b800d31fe2a4b14800f0e0c50fc2f20a8 (patch) | |
| tree | 13c8e5ee592196d3eeb48910314c6c4d3162fcee /gst-libs/gst/gl/x11/gstglcontext_glx.c | |
| parent | 5b0da41038ec54ec7ccfcd2b5bb06ed74175842b (diff) | |
| download | gstreamer-plugins-bad-7d2d3b3b800d31fe2a4b14800f0e0c50fc2f20a8.tar.gz | |
gl/glx: use the context's display rather than asking for the window's
Diffstat (limited to 'gst-libs/gst/gl/x11/gstglcontext_glx.c')
| -rw-r--r-- | gst-libs/gst/gl/x11/gstglcontext_glx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gst-libs/gst/gl/x11/gstglcontext_glx.c b/gst-libs/gst/gl/x11/gstglcontext_glx.c index 400e629ac..22e79ef45 100644 --- a/gst-libs/gst/gl/x11/gstglcontext_glx.c +++ b/gst-libs/gst/gl/x11/gstglcontext_glx.c @@ -142,6 +142,7 @@ gst_gl_context_glx_create_context (GstGLContext * context, GstGLContextGLX *context_glx; GstGLWindow *window; GstGLWindowX11 *window_x11; + GstGLDisplay *display; gboolean create_context; const char *glx_exts; int x_error; @@ -151,6 +152,7 @@ gst_gl_context_glx_create_context (GstGLContext * context, context_glx = GST_GL_CONTEXT_GLX (context); window = gst_gl_context_get_window (context); window_x11 = GST_GL_WINDOW_X11 (window); + display = gst_gl_context_get_display (context); if (other_context) { if (gst_gl_context_get_gl_platform (other_context) != GST_GL_PLATFORM_GLX) { @@ -163,7 +165,7 @@ gst_gl_context_glx_create_context (GstGLContext * context, external_gl_context = gst_gl_context_get_gl_context (other_context); } - device = (Display *) gst_gl_display_get_handle (window->display); + device = (Display *) gst_gl_display_get_handle (display); glx_exts = glXQueryExtensionsString (device, DefaultScreen (device)); create_context = gst_gl_check_extension ("GLX_ARB_create_context", glx_exts); @@ -229,12 +231,14 @@ gst_gl_context_glx_create_context (GstGLContext * context, GST_LOG ("gl context id: %ld", (gulong) context_glx->glx_context); gst_object_unref (window); + gst_object_unref (display); return TRUE; failure: if (window) gst_object_unref (window); + gst_object_unref (display); return FALSE; } |