]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
doh
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 4 Mar 2008 23:42:16 +0000 (23:42 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 4 Mar 2008 23:42:16 +0000 (23:42 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7788 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_conference/mod_conference.c

index c17103c707b3ce88e0d9ddd8b2fdb14fb836dd3c..695a68b31fb11364c9050da4ef1b75127427cfae 100644 (file)
@@ -865,7 +865,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t * thread,
                        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 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t * t
        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);