From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 10 Mar 2015 22:46:37 +0000 (-0500)
Subject: FS-7514: amend
X-Git-Tag: v1.6.2~614^2~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc2e4c42ca1a9c9e2e93d21e90fcdc78037d7dab;p=thirdparty%2Ffreeswitch.git

FS-7514: amend
---

diff --git a/src/mod/formats/mod_vlc/mod_vlc.c b/src/mod/formats/mod_vlc/mod_vlc.c
index 9aa6ce2e83..a12e17eb9a 100644
--- a/src/mod/formats/mod_vlc/mod_vlc.c
+++ b/src/mod/formats/mod_vlc/mod_vlc.c
@@ -62,8 +62,8 @@ typedef int  (*imem_get_t)(void *data, const char *cookie,
 typedef void (*imem_release_t)(void *data, const char *cookie, size_t, void *);
 
 /* Change value to -vvv for vlc related debug. Be careful since vlc is at least as verbose as FS about logging */
-//const char *vlc_args[] = {""};
-const char *vlc_args[] = {"--network-caching=0"};
+const char *vlc_args[] = {""};
+//const char *vlc_args[] = {"--network-caching=0"};
 //--sout-mux-caching
 
 switch_endpoint_interface_t *vlc_endpoint_interface = NULL;
@@ -846,7 +846,7 @@ static switch_status_t vlc_file_open(switch_file_handle_t *handle, const char *p
 									    "dst=rtmp://%s"
 									   "}", 
 									   keyint, ab, vb, channels, samplerate, path);
->>>>>>> add file params to set some optimal settings from conference into recording handle and make streaming better
+
 		}
 	}