diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-05-25 04:31:29 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-05-25 04:31:29 +0000 |
| commit | 43ef777450d68ad9ac3dd10300a8639070e6b89f (patch) | |
| tree | 4f71ed5cd480d90d56ccf7c1099756f924a9b9ff | |
| parent | 064b491d6efe1394c9778f1e7eee0fec638bcbd6 (diff) | |
Re #1917(misc): Update how PJMEDIA_VIDEO_DEV_HAS_OPENGL is define.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5315 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia-videodev/config.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h index b641466a..9322f7af 100644 --- a/pjmedia/include/pjmedia-videodev/config.h +++ b/pjmedia/include/pjmedia-videodev/config.h @@ -122,12 +122,20 @@ PJ_BEGIN_DECL /** - * 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) */ #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 |