ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #800 from Sune1337/pthread_join 

* use pthread_join instead of pthread_tryjoin_np
pull/802/head
Andrew Bauer 2015-04-12 11:51:50 -05:00
parent 411b518b14 5779b2e20f
commit e4cf323949
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.");
} }