save video capture/display while setted

diff --git a/Makefile.am b/Makefile.am
index 8756019f4982b7ae68e0eabb4faf394a7e062749..4aa4332f2f99962cc4b085e3c66f015dbb994c12 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -232,6 +232,4 @@ clean-local:
 discovery:
        touch specs.cpp
        $(CC) --include $(top_builddir)/config.h \
-          --include $(top_builddir)/mediastreamer2/mediastreamer-config.h  \
-          --include $(top_builddir)/oRTP/ortp-config.h \
           $(TUNNEL_CFLAGS) $(CFLAGS) $(MEDIASTREAMER2_CFLAGS) $(ORTP_CFLAGS) -E -P -v -dD specs.cpp

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 7c11e83aeb418fb446181b32a8e1229473ff40a9..ada16d69bb6d2bee292ef28b3603ecd8b9f7f79b 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3840,7 +3840,10 @@ void linphone_core_enable_video(LinphoneCore *lc, bool_t vcap_enabled, bool_t di
 #endif
        lc->video_conf.capture=vcap_enabled;
        lc->video_conf.display=display_enabled;
-
+       if (linphone_core_ready(lc)){
+               lp_config_set_int(lc->config,"video","display",lc->video_conf.display);
+               lp_config_set_int(lc->config,"video","capture",lc->video_conf.capture);
+       }
        /* need to re-apply network bandwidth settings*/
        linphone_core_set_download_bandwidth(lc,
                linphone_core_get_download_bandwidth(lc));