Changeset 4086


Ignore:
Timestamp:
Apr 26, 2012 2:44:41 AM (7 years ago)
Author:
ming
Message:

Re #1446 (misc): Fixed linking error if PJMEDIA_HAS_VIDEO is 0

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/avi_dev.c

    r4047 r4086  
    2525#include <pjmedia/vid_codec.h> 
    2626 
    27 #if defined(PJMEDIA_VIDEO_DEV_HAS_AVI) && PJMEDIA_VIDEO_DEV_HAS_AVI != 0 
     27#if defined(PJMEDIA_VIDEO_DEV_HAS_AVI) && PJMEDIA_VIDEO_DEV_HAS_AVI != 0 && \ 
     28    defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) 
    2829 
    2930#define THIS_FILE               "avi_dev.c" 
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

    r4027 r4086  
    57425742    /* Create AVI player virtual devices */ 
    57435743    if (app_config.avi_cnt) { 
    5744 #if PJMEDIA_VIDEO_DEV_HAS_AVI 
     5744#if PJMEDIA_HAS_VIDEO && PJMEDIA_VIDEO_DEV_HAS_AVI 
    57455745        pjmedia_vid_dev_factory *avi_factory; 
    57465746 
     
    61016101        if (app_config.avi[i].slot != PJSUA_INVALID_ID) 
    61026102            pjsua_conf_remove_port(app_config.avi[i].slot); 
     6103#if PJMEDIA_HAS_VIDEO && PJMEDIA_VIDEO_DEV_HAS_AVI 
    61036104        if (app_config.avi[i].dev_id != PJMEDIA_VID_INVALID_DEV) 
    61046105            pjmedia_avi_dev_free(app_config.avi[i].dev_id); 
     6106#endif 
    61056107    } 
    61066108 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

    r4071 r4086  
    219219    cfg->vid_cap_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV; 
    220220    cfg->vid_rend_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV; 
     221#if PJMEDIA_HAS_VIDEO 
    221222    pjmedia_vid_stream_rc_config_default(&cfg->vid_stream_rc_cfg); 
     223#endif 
    222224    pjsua_transport_config_default(&cfg->rtp_cfg); 
    223225    cfg->use_srtp = pjsua_var.ua_cfg.use_srtp; 
Note: See TracChangeset for help on using the changeset viewer.