diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-12-01 10:02:54 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-12-01 10:02:54 +0000 |
| commit | 5a41db1f3ba90b676e9485a15841e5fec656ed58 (patch) | |
| tree | 0d1d1e3871563b751a7d2c57806dc2cc7d2cc9ab /pjsip | |
| parent | fb7ffe37b9ca728f0d3f6bf57b937e114d2f9161 (diff) | |
Misc (re #1393): fix linking error "app_config_init_video() not found" when video is disabled, also some compile warnings (unused variables).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3892 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 11 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index cec75935..2447b80c 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -3520,7 +3520,6 @@ static void pjsua_call_on_rx_offer(pjsip_inv_session *inv, pjsua_call *call; pjmedia_sdp_session *answer; unsigned i; - int vid_idx; pj_status_t status; PJSUA_LOCK(); @@ -3532,16 +3531,6 @@ static void pjsua_call_on_rx_offer(pjsip_inv_session *inv, call->index)); pj_log_push_indent(); -#if 0 && PJMEDIA_HAS_VIDEO - /* If current session has no video, let's just stay with no video. - * If application want to enable video, it must send re-INVITE - * with video. - */ - vid_idx = pjsua_call_get_vid_stream_idx(call->index); - if (vid_idx == -1 || call->media[vid_idx].dir == PJMEDIA_DIR_NONE) - call->opt.video_cnt = 0; -#endif - /* Re-init media for the new remote offer before creating SDP */ status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS, call->secure_level, diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 138f4808..3eb8cee6 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -1397,7 +1397,6 @@ pj_status_t pjsua_call_media_init(pjsua_call_media *call_med, pj_bool_t async, pjsua_med_tp_state_cb cb) { - pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id]; pj_status_t status = PJ_SUCCESS; /* @@ -1409,6 +1408,8 @@ pj_status_t pjsua_call_media_init(pjsua_call_media *call_med, /* Create the media transport for initial call. */ if (call_med->tp == NULL) { #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) + pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id]; + /* While in initial call, set default video devices */ if (type == PJMEDIA_TYPE_VIDEO) { call_med->strm.v.rdr_dev = acc->cfg.vid_rend_dev; @@ -2552,7 +2553,7 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, mvididx, &mvidcnt, &mtotvidcnt); #else PJ_UNUSED_ARG(STR_VIDEO); - mvidcnt = 0; + mvidcnt = mtotvidcnt = 0; #endif /* Applying media count limitation. Note that in generating SDP answer, |