diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-07-11 00:51:12 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-07-11 00:51:12 +0000 |
| commit | e653f265722334db32279a1df27d1d6ee89d75e9 (patch) | |
| tree | b0c319bef5cea08fe1a73109e1d096f97386e97c | |
| parent | 430feb7bca68a40abe5322e9a9db0d5b0dee5e19 (diff) | |
Re #1937: Do not build libyuv in shared mode if video is disabled.
Thanks to Ross Beer for the report.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5378 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/converter.c | 6 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/converter_libyuv.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c index 8f177373..1843a0a1 100644 --- a/pjmedia/src/pjmedia/converter.c +++ b/pjmedia/src/pjmedia/converter.c @@ -35,7 +35,8 @@ PJ_DECL(pj_status_t) pjmedia_libswscale_converter_init(pjmedia_converter_mgr *mgr); #endif -#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 +#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ + defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0) PJ_DECL(pj_status_t) pjmedia_libyuv_converter_init(pjmedia_converter_mgr *mgr); #endif @@ -61,7 +62,8 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool, } #endif -#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 +#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ + defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0) status = pjmedia_libyuv_converter_init(mgr); if (status != PJ_SUCCESS) { PJ_PERROR(4,(THIS_FILE, status, diff --git a/pjmedia/src/pjmedia/converter_libyuv.c b/pjmedia/src/pjmedia/converter_libyuv.c index c4f80059..29aedac9 100644 --- a/pjmedia/src/pjmedia/converter_libyuv.c +++ b/pjmedia/src/pjmedia/converter_libyuv.c @@ -20,7 +20,8 @@ #include <pjmedia/converter.h> #include <pj/errno.h> -#if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0 +#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) && \ + defined(PJMEDIA_HAS_LIBYUV) && (PJMEDIA_HAS_LIBYUV != 0) #include <libyuv.h> |