opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

deps-libff: Abort timer thread instead of cancelling

Browse Source
This commit is contained in:
John Bradley
2015-03-19 11:56:00 -05:00
parent 7a4a5e3fad
commit 47783f26c7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deps/libff/libff/ff-timer.c
Vendored
+5 -1
View File
@@ -99,7 +99,11 @@ void ff_timer_free(struct ff_timer *timer)
assert(timer != NULL);
pthread_cancel(timer->timer_thread);
pthread_mutex_lock(&timer->mutex);
timer->abort = true;
pthread_cond_signal(&timer->cond);
pthread_mutex_unlock(&timer->mutex);
pthread_join(timer->timer_thread, &thread_result);
pthread_mutex_destroy(&timer->mutex);