at v192 850 B view raw
1diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c 2--- a/src/base/msfactory.c 2015-05-13 16:53:49.801113249 +0200 3+++ b/src/base/msfactory.c 2015-08-26 21:35:44.994724647 +0200 4@@ -630,12 +630,18 @@ 5 } 6 7 void ms_factory_init_plugins(MSFactory *obj) { 8+ char *package_plugins_dir; 9 if (obj->plugins_dir == NULL) { 10+ package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR"); 11+ if (package_plugins_dir!=NULL){ 12+ obj->plugins_dir = ms_strdup(package_plugins_dir); 13+ } else { 14 #ifdef PACKAGE_PLUGINS_DIR 15- obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); 16+ obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); 17 #else 18- obj->plugins_dir = ms_strdup(""); 19+ obj->plugins_dir = ms_strdup(""); 20 #endif 21+ } 22 } 23 if (strlen(obj->plugins_dir) > 0) { 24 ms_message("Loading ms plugins from [%s]",obj->plugins_dir);