diff options
author | Jason Parker <jparker@digium.com> | 2013-03-11 15:49:45 -0500 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:49:45 -0500 |
commit | 09114052f74fe74bbf652189cedefe41b7141b86 (patch) | |
tree | 6814977399b53176a53efc7ef5dffda1643b9d27 /pjmedia/include/pjmedia-videodev/config.h | |
parent | 1873b7a03a08b00140610d531bb6c0bb71e0e91a (diff) | |
parent | 1ab0bfe2d710db21587a9bf6c01b2392d5bd8ac7 (diff) |
Merge branch 'patch/shared-libraries' of github.com:asterisk/pjproject
Conflicts:
aconfigure
build/rules.mak
Diffstat (limited to 'pjmedia/include/pjmedia-videodev/config.h')
-rw-r--r-- | pjmedia/include/pjmedia-videodev/config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h index ef161eb..84042dc 100644 --- a/pjmedia/include/pjmedia-videodev/config.h +++ b/pjmedia/include/pjmedia-videodev/config.h @@ -52,6 +52,8 @@ PJ_BEGIN_DECL #endif +#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) + /** * This setting controls whether SDL support should be included. * @@ -144,6 +146,8 @@ PJ_BEGIN_DECL # undef PJMEDIA_SDL_LIB #endif +#endif /* defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) */ + /** * @} */ |