]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10091
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 15 Mar 2017 23:12:57 +0000 (18:12 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 15 Mar 2017 23:14:08 +0000 (18:14 -0500)
src/mod/applications/mod_conference/conference_file.c

index 28e63d40bf5af2de3d0dfe4b99b3f3cb77bfc04a..8fe7bfa87246ad35495b51f478e33d1fb4e96b53 100644 (file)
@@ -91,13 +91,9 @@ switch_status_t conference_file_close(conference_obj_t *conference, conference_f
                conference_al_close(node->al);
        }
 #endif
-       if (conference->playing_video_file && switch_core_file_has_video(&node->fh, SWITCH_FALSE) && conference->canvases[0] && node->canvas_id > -1) {
-               if (conference->canvases[node->canvas_id]->timer.timer_interface) {
-                       conference->canvases[node->canvas_id]->timer.interval = conference->video_fps.ms;
-                       conference->canvases[node->canvas_id]->timer.samples = conference->video_fps.samples;
-                       switch_core_timer_sync(&conference->canvases[node->canvas_id]->timer);
-                       conference->canvases[node->canvas_id]->send_keyframe = 1;
-               }
+
+       if (conference->playing_video_file) {
+               conference->canvases[node->canvas_id]->send_keyframe = 1;
                conference->playing_video_file = 0;
        }
        return switch_core_file_close(&node->fh);