ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* use pthread_join instead of pthread_tryjoin_np

This commit is contained in:
Sune1337 2015-04-08 22:15:54 +02:00
parent c39984b228
commit 5779b2e20f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_ffmpeg_camera.cpp
View File

@ -120,7 +120,7 @@ int FfmpegCamera::Capture( Image &image )
void *retval = 0; void *retval = 0;
int ret; int ret;
ret = pthread_tryjoin_np(mReopenThread, &retval); ret = pthread_join(mReopenThread, &retval);
if (ret != 0){ if (ret != 0){
Error("Could not join reopen thread."); Error("Could not join reopen thread.");
} }