提交 7c636705 authored 作者: Mike Jerris's avatar Mike Jerris 提交者: Brian West

FS-7236: fix mutex use before init error caused by 27c8622e

上级 f4e68221
...@@ -9578,12 +9578,6 @@ SWITCH_STANDARD_APP(conference_function) ...@@ -9578,12 +9578,6 @@ SWITCH_STANDARD_APP(conference_function)
member.channel = switch_core_session_get_channel(session); member.channel = switch_core_session_get_channel(session);
member.pool = switch_core_session_get_pool(session); member.pool = switch_core_session_get_pool(session);
if (setup_media(&member, conference)) {
//flags = 0;
goto done;
}
if (!(mid = switch_channel_get_private(channel, "__confmid"))) { if (!(mid = switch_channel_get_private(channel, "__confmid"))) {
mid = switch_core_session_alloc(session, sizeof(*mid)); mid = switch_core_session_alloc(session, sizeof(*mid));
*mid = next_member_id(); *mid = next_member_id();
...@@ -9605,6 +9599,10 @@ SWITCH_STANDARD_APP(conference_function) ...@@ -9605,6 +9599,10 @@ SWITCH_STANDARD_APP(conference_function)
/* Install our Signed Linear codec so we get the audio in that format */ /* Install our Signed Linear codec so we get the audio in that format */
switch_core_session_set_read_codec(member.session, &member.read_codec); switch_core_session_set_read_codec(member.session, &member.read_codec);
if (setup_media(&member, conference)) {
//flags = 0;
goto done;
}
mflags = conference->mflags; mflags = conference->mflags;
set_mflags(flags_str, &mflags); set_mflags(flags_str, &mflags);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论