5 files changed, 27 insertions, 4 deletions
diff --git a/pjmedia/src/test/test.c b/pjmedia/src/test/test.c
index d243ed8a..82b20e17 100644
--- a/pjmedia/src/test/test.c
+++ b/pjmedia/src/test/test.c
@@ -58,9 +58,11 @@ int test_main(void)
 
     mem = &caching_pool.factory;
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
     pjmedia_converter_mgr_create(pool, NULL);
     pjmedia_vid_codec_mgr_create(pool, NULL);
+#endif
 
 #if HAS_VID_PORT_TEST
     DO_TEST(vid_port_test());
@@ -99,10 +101,12 @@ on_return:
 	PJ_LOG(3,(THIS_FILE,"Looks like everything is okay!"));
     }
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     pjmedia_video_format_mgr_destroy(pjmedia_video_format_mgr_instance());
     pjmedia_converter_mgr_destroy(pjmedia_converter_mgr_instance());
     pjmedia_vid_codec_mgr_destroy(pjmedia_vid_codec_mgr_instance());
-    
+#endif
+
     pj_pool_release(pool);
     pj_caching_pool_destroy(&caching_pool);
 
diff --git a/pjmedia/src/test/test.h b/pjmedia/src/test/test.h
index abd7d0bd..f7fae812 100644
--- a/pjmedia/src/test/test.h
+++ b/pjmedia/src/test/test.h
@@ -23,9 +23,9 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
-#define HAS_VID_DEV_TEST	1
-#define HAS_VID_PORT_TEST	0
-#define HAS_VID_CODEC_TEST	1
+#define HAS_VID_DEV_TEST	PJMEDIA_HAS_VIDEO
+#define HAS_VID_PORT_TEST	PJMEDIA_HAS_VIDEO
+#define HAS_VID_CODEC_TEST	PJMEDIA_HAS_VIDEO
 #define HAS_SDP_NEG_TEST	1
 #define HAS_JBUF_TEST		1
 #define HAS_MIPS_TEST		1
diff --git a/pjmedia/src/test/vid_codec_test.c b/pjmedia/src/test/vid_codec_test.c
index 36ca19ac..41171a9a 100644
--- a/pjmedia/src/test/vid_codec_test.c
+++ b/pjmedia/src/test/vid_codec_test.c
@@ -4,6 +4,10 @@
 #include <pjmedia/vid_codec.h>
 #include <pjmedia/port.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE "vid_codec.c"
 
 #define BYPASS_CODEC	    0
@@ -465,3 +469,4 @@ on_return:
 }
 
 
+#endif /* PJMEDIA_HAS_VIDEO */
diff --git a/pjmedia/src/test/vid_dev_test.c b/pjmedia/src/test/vid_dev_test.c
index 0b4572a5..08b60a54 100644
--- a/pjmedia/src/test/vid_dev_test.c
+++ b/pjmedia/src/test/vid_dev_test.c
@@ -23,6 +23,10 @@
 #include <pjmedia/vid_codec.h>
 #include <pjmedia_videodev.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE 	"vid_dev_test.c"
 #define LOOP_DURATION	10
 
@@ -292,3 +296,6 @@ on_return:
     
     return rc;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */
diff --git a/pjmedia/src/test/vid_port_test.c b/pjmedia/src/test/vid_port_test.c
index 5d04e24b..b47cd1b5 100644
--- a/pjmedia/src/test/vid_port_test.c
+++ b/pjmedia/src/test/vid_port_test.c
@@ -23,6 +23,10 @@
 #include <pjmedia/vid_codec.h>
 #include <pjmedia_videodev.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE 	"vid_dev_test.c"
 #define LOOP_DURATION	6
 
@@ -239,3 +243,6 @@ on_return:
 
     return rc;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */