Changeset 3892


Ignore:
Timestamp:
Dec 1, 2011 10:02:54 AM (8 years ago)
Author:
nanang
Message:

Misc (re #1393): fix linking error "app_config_init_video() not found" when video is disabled, also some compile warnings (unused variables).

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

    r3891 r3892  
    41884188} 
    41894189 
     4190#else 
     4191 
     4192static void app_config_init_video(pjsua_acc_config *acc_cfg) 
     4193{ 
     4194    PJ_UNUSED_ARG(acc_cfg); 
     4195} 
     4196 
    41904197#endif /* PJSUA_HAS_VIDEO */ 
    41914198 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r3891 r3892  
    35213521    pjmedia_sdp_session *answer; 
    35223522    unsigned i; 
    3523     int vid_idx; 
    35243523    pj_status_t status; 
    35253524 
     
    35323531              call->index)); 
    35333532    pj_log_push_indent(); 
    3534  
    3535 #if 0 && PJMEDIA_HAS_VIDEO 
    3536     /* If current session has no video, let's just stay with no video. 
    3537      * If application want to enable video, it must send re-INVITE 
    3538      * with video. 
    3539      */ 
    3540     vid_idx = pjsua_call_get_vid_stream_idx(call->index); 
    3541     if (vid_idx == -1 || call->media[vid_idx].dir == PJMEDIA_DIR_NONE) 
    3542         call->opt.video_cnt = 0; 
    3543 #endif 
    35443533 
    35453534    /* Re-init media for the new remote offer before creating SDP */ 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

    r3891 r3892  
    13981398                                  pjsua_med_tp_state_cb cb) 
    13991399{ 
    1400     pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id]; 
    14011400    pj_status_t status = PJ_SUCCESS; 
    14021401 
     
    14101409    if (call_med->tp == NULL) { 
    14111410#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) 
     1411        pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id]; 
     1412 
    14121413        /* While in initial call, set default video devices */ 
    14131414        if (type == PJMEDIA_TYPE_VIDEO) { 
     
    25532554#else 
    25542555    PJ_UNUSED_ARG(STR_VIDEO); 
    2555     mvidcnt = 0; 
     2556    mvidcnt = mtotvidcnt = 0; 
    25562557#endif 
    25572558 
Note: See TracChangeset for help on using the changeset viewer.