From: Joao Mesquita <jmesquita@freeswitch.org>
Date: Tue, 28 Dec 2010 00:31:40 +0000 (-0300)
Subject: Merge branch 'master' of git@git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~223^2~2^2^2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49a524b79ba74a8bb37092a7b8bf60821fe8e3ba;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git@git.freeswitch.org:freeswitch

Conflicts:

	src/mod/applications/mod_conference/mod_conference.c
---

49a524b79ba74a8bb37092a7b8bf60821fe8e3ba
diff --cc src/mod/applications/mod_conference/mod_conference.c
index c6a409e7ba,fef64d50fc..bdf565952e
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@@ -5993,8 -5984,10 +5992,12 @@@ static conference_obj_t *conference_new
  	char *verbose_events = NULL;
  	char *auto_record = NULL;
  	char *terminate_on_silence = NULL;
 +	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
 +	switch_uuid_t uuid;
+ 	switch_codec_implementation_t read_impl = { 0 };
+ 	switch_channel_t *channel = NULL;
+ 	const char *force_rate = NULL, *force_interval = NULL;
+ 	uint32_t force_rate_i = 0, force_interval_i = 0;
  
  	/* Validate the conference name */
  	if (zstr(name)) {