kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #593 in FS/freeswitch from ~MICJERRY/freeswitchmultimedia:master to master 

* commit 'acecda7596beb5dc3a4f98cb126351d9c25454fb':
  FS-8527 [mod_conference] Do not send the video of last_video_floor_holder to video_floor_holder if already related one video to it.
This commit is contained in:
Mike Jerris 2015-11-19 11:10:52 -06:00
parent ae376b096e acecda7596
commit 31c9bca8e9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/applications/mod_conference/conference_video.c
View File

@ -3537,7 +3537,8 @@ switch_status_t conference_video_thread_callback(switch_core_session_t *session,
conference_member_t *fmember;
if ((fmember = conference_member_get(member->conference, member->conference->video_floor_holder))) {
switch_core_session_write_video_frame(fmember->session, frame, SWITCH_IO_FLAG_NONE, 0);
if (!conference_utils_member_test_flag(fmember, MFLAG_RECEIVING_VIDEO))
switch_core_session_write_video_frame(fmember->session, frame, SWITCH_IO_FLAG_NONE, 0);
switch_thread_rwlock_unlock(fmember->rwlock);
}
}