diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-04-26 02:44:41 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-04-26 02:44:41 +0000 |
| commit | 794e93a6f3e461f4eee7b4f2ebe07cdd91828498 (patch) | |
| tree | b6cf122093cae571c325e7b8975d1acbb138a362 | |
| parent | 111035089e271f3ba260b349521f367a71148cad (diff) | |
Re #1446 (misc): Fixed linking error if PJMEDIA_HAS_VIDEO is 0
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4086 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/avi_dev.c | 3 | ||||
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia-videodev/avi_dev.c b/pjmedia/src/pjmedia-videodev/avi_dev.c index de327648..6f6c4813 100644 --- a/pjmedia/src/pjmedia-videodev/avi_dev.c +++ b/pjmedia/src/pjmedia-videodev/avi_dev.c @@ -24,7 +24,8 @@ #include <pj/rand.h> #include <pjmedia/vid_codec.h> -#if defined(PJMEDIA_VIDEO_DEV_HAS_AVI) && PJMEDIA_VIDEO_DEV_HAS_AVI != 0 +#if defined(PJMEDIA_VIDEO_DEV_HAS_AVI) && PJMEDIA_VIDEO_DEV_HAS_AVI != 0 && \ + defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) #define THIS_FILE "avi_dev.c" #define DRIVER_NAME "AVIDev" diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index 23c5b215..ee25718d 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -5741,7 +5741,7 @@ pj_status_t app_init(int argc, char *argv[]) /* Create AVI player virtual devices */ if (app_config.avi_cnt) { -#if PJMEDIA_VIDEO_DEV_HAS_AVI +#if PJMEDIA_HAS_VIDEO && PJMEDIA_VIDEO_DEV_HAS_AVI pjmedia_vid_dev_factory *avi_factory; status = pjmedia_avi_dev_create_factory(pjsua_get_pool_factory(), @@ -6100,8 +6100,10 @@ pj_status_t app_destroy(void) for (i=0; i<app_config.avi_cnt; ++i) { if (app_config.avi[i].slot != PJSUA_INVALID_ID) pjsua_conf_remove_port(app_config.avi[i].slot); +#if PJMEDIA_HAS_VIDEO && PJMEDIA_VIDEO_DEV_HAS_AVI if (app_config.avi[i].dev_id != PJMEDIA_VID_INVALID_DEV) pjmedia_avi_dev_free(app_config.avi[i].dev_id); +#endif } /* Close ringback port */ diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 8b6dc46e..266dd09f 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -218,7 +218,9 @@ PJ_DEF(void) pjsua_acc_config_default(pjsua_acc_config *cfg) cfg->ka_data = pj_str("\r\n"); cfg->vid_cap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV; cfg->vid_rend_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV; +#if PJMEDIA_HAS_VIDEO pjmedia_vid_stream_rc_config_default(&cfg->vid_stream_rc_cfg); +#endif pjsua_transport_config_default(&cfg->rtp_cfg); cfg->use_srtp = pjsua_var.ua_cfg.use_srtp; cfg->srtp_secure_signaling = pjsua_var.ua_cfg.srtp_secure_signaling; |