[vlc-commits] interop_cvpx: use macosx-glcontext from the global state

Alexandre Janniaux git at videolan.org
Thu Nov 12 12:17:37 CET 2020


vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Fri Nov  6 12:41:35 2020 +0100| [50ac0462ba75a19e8a7ae78c432b88da6d3800b1] | committer: Alexandre Janniaux

interop_cvpx: use macosx-glcontext from the global state

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

 modules/video_output/opengl/interop_cvpx.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/opengl/interop_cvpx.m b/modules/video_output/opengl/interop_cvpx.m
index 4508e096b1..7fc985508e 100644
--- a/modules/video_output/opengl/interop_cvpx.m
+++ b/modules/video_output/opengl/interop_cvpx.m
@@ -205,10 +205,10 @@ Open(vlc_object_t *obj)
 #else
     const GLenum tex_target = GL_TEXTURE_RECTANGLE;
     {
-        priv->gl_ctx = var_InheritAddress(interop->gl, "macosx-glcontext");
+        priv->gl_ctx = CGLGetCurrentContext();
         if (!priv->gl_ctx)
         {
-            msg_Err(interop->gl, "can't find macosx-glcontext");
+            msg_Warn(&interop->obj, "OpenGL provider is not using CGL, cannot use interop_cvpx");
             free(priv);
             return VLC_EGENERIC;
         }



More information about the vlc-commits mailing list