Changeset 5315


Ignore:
Timestamp:
May 25, 2016 4:31:29 AM (3 years ago)
Author:
riza
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h

    r5309 r5315  
    123123 
    124124/** 
    125  * This setting controls whether OpenGL support should be included. 
     125 * This setting controls whether OpenGL support should be included. Note that as 
     126 * currently only OpenGLES is supported, when PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES is 
     127 * unset, PJMEDIA_VIDEO_DEV_HAS_OPENGL will automatically also be unset. 
    126128 * 
    127129 * Default: 0 (or detected by configure) 
     
    129131#ifndef PJMEDIA_VIDEO_DEV_HAS_OPENGL 
    130132#   define PJMEDIA_VIDEO_DEV_HAS_OPENGL         0 
     133#else 
     134#  if defined(PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES) && \ 
     135              PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES == 0 
     136#    undef  PJMEDIA_VIDEO_DEV_HAS_OPENGL 
     137#    define PJMEDIA_VIDEO_DEV_HAS_OPENGL        0 
     138#  endif 
    131139#endif 
    132140 
Note: See TracChangeset for help on using the changeset viewer.