diff options
Diffstat (limited to 'pjsip/src')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 3 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 1c835e15..f8abc938 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -1324,8 +1324,7 @@ PJ_DEF(pj_status_t) pjsua_call_get_info( pjsua_call_id call_id, call_med->strm.v.rdr_win_id; if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) { - pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.cap_win_id]; - cap_dev = w->preview_cap_id; + cap_dev = call_med->strm.v.cap_dev; } info->media[info->media_cnt].stream.vid.cap_dev = cap_dev; } else { diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index d19bb744..7c2929fc 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -315,8 +315,6 @@ static pj_bool_t options_on_rx_request(pjsip_rx_data *rdata) { pjsip_tx_data *tdata; pjsip_response_addr res_addr; - pjmedia_transport_info tpinfo; - pjmedia_sdp_session *sdp; const pjsip_hdr *cap_hdr; pj_status_t status; @@ -385,6 +383,9 @@ static pj_bool_t options_on_rx_request(pjsip_rx_data *rdata) /* Get media socket info, make sure transport is ready */ #if DISABLED_FOR_TICKET_1185 if (pjsua_var.calls[0].med_tp) { + pjmedia_transport_info tpinfo; + pjmedia_sdp_session *sdp; + pjmedia_transport_info_init(&tpinfo); pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo); @@ -2620,6 +2621,8 @@ PJ_DEF(void) pjsua_dump(pj_bool_t detail) pjmedia_endpt_dump(pjsua_get_pjmedia_endpt()); PJ_LOG(3,(THIS_FILE, "Dumping media transports:")); + // Suppress compile warning caused by unreferenced var. + PJ_UNUSED_ARG(i); #if DISABLED_FOR_TICKET_1185 for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) { pjsua_call *call = &pjsua_var.calls[i]; |