diff --git a/src/mod/applications/mod_av/avformat.c b/src/mod/applications/mod_av/avformat.c index 8b678e845f..43e2d8c40b 100644 --- a/src/mod/applications/mod_av/avformat.c +++ b/src/mod/applications/mod_av/avformat.c @@ -2178,6 +2178,7 @@ static switch_status_t av_file_seek(switch_file_handle_t *handle, unsigned int * context->seek_ts = samples / handle->native_rate * AV_TIME_BASE; *cur_sample = context->seek_ts; + context->closed = 0; if (!context->file_read_thread_running) { switch_threadattr_t *thd_attr = NULL; @@ -2213,7 +2214,7 @@ static switch_status_t av_file_read(switch_file_handle_t *handle, void *data, si } switch_mutex_unlock(context->mutex); - if (!context->file_read_thread_running && switch_buffer_inuse(context->audio_buffer) == 0) { + if (context->closed || (!context->file_read_thread_running && switch_buffer_inuse(context->audio_buffer) == 0)) { *len = 0; return SWITCH_STATUS_FALSE; } @@ -2496,7 +2497,7 @@ static switch_status_t av_file_read_video(switch_file_handle_t *handle, switch_f } context->vid_ready = 1; } - + if (!frame->img) context->closed = 1; return frame->img ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; } #endif diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index ee6914f27b..b8a8fdfb7a 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -910,6 +910,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg, } switch_img_patch(layer->img, layer->overlay_img, 0, 0); + } switch_mutex_unlock(layer->overlay_mutex);