Changeset 4086 for pjproject/trunk

Timestamp:

Apr 26, 2012 2:44:41 AM (13 years ago)

Author:

ming

Message:

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

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-videodev/avi_dev.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-videodev/avi_dev.c

@@ -25 +25 @@
 #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"

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -5742 +5742 @@
     /* 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;
 
@@ -6101 +6101 @@
         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
     }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -219 +219 @@
     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;