[Freeswitch-svn] [commit] r7788 - freeswitch/trunk/src/mod/applications/mod_conference

[Freeswitch SVN]

Author: anthm
Date: Tue Mar  4 18:42:16 2008
New Revision: 7788

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
doh

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Tue Mar  4 18:42:16 2008
@@ -865,7 +865,7 @@
 			total++;
 			imember->read = 0;
 
-			if (switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
+			if (imember->session && switch_channel_test_flag(switch_core_session_get_channel(imember->session), CF_VIDEO)) {
 				members_with_video++;
 			}
 
@@ -1979,6 +1979,11 @@
 	member->id = next_member_id();
 	member->pool = rec->pool;
 
+    member->frame_size = SWITCH_RECOMMENDED_BUFFER_SIZE;
+    member->frame = switch_core_alloc(member->pool, member->frame_size);
+    member->mux_frame = switch_core_alloc(member->pool, member->frame_size);
+
+
 	switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool);
 	switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool);
 	switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool);