Changeset 5315 for pjproject

Timestamp:

May 25, 2016 4:31:29 AM (8 years ago)

Author:

riza

Message:

Re #1917(misc): Update how PJMEDIA_VIDEO_DEV_HAS_OPENGL is define.

File:

• pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h

@@ -123 +123 @@
 
 /**
- * This setting controls whether OpenGL support should be included.
+ * This setting controls whether OpenGL support should be included. Note that as
+ * currently only OpenGLES is supported, when PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES is
+ * unset, PJMEDIA_VIDEO_DEV_HAS_OPENGL will automatically also be unset.
  *
  * Default: 0 (or detected by configure)
@@ -129 +131 @@
 #ifndef PJMEDIA_VIDEO_DEV_HAS_OPENGL
 #   define PJMEDIA_VIDEO_DEV_HAS_OPENGL         0
+#else
+#  if defined(PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES) && \
+              PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES == 0
+#    undef  PJMEDIA_VIDEO_DEV_HAS_OPENGL
+#    define PJMEDIA_VIDEO_DEV_HAS_OPENGL        0
+#  endif
 #endif