diff options
Diffstat (limited to 'main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch')
| -rw-r--r-- | main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch new file mode 100644 index 0000000000..b7cbb4c3c2 --- /dev/null +++ b/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch @@ -0,0 +1,25 @@ +From 5779b2e20fe7d5e43a5a38ab289e45fc0ffc9545 Mon Sep 17 00:00:00 2001 +From: Sune1337 <kristoffer.lindahl@gmail.com> +Date: Wed, 8 Apr 2015 22:15:54 +0200 +Subject: [PATCH] * use pthread_join instead of pthread_tryjoin_np + +--- + src/zm_ffmpeg_camera.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp +index 9a4ea5f..5ae1e4a 100644 +--- a/src/zm_ffmpeg_camera.cpp ++++ b/src/zm_ffmpeg_camera.cpp +@@ -120,7 +120,7 @@ int FfmpegCamera::Capture( Image &image ) + void *retval = 0; + int ret; + +- ret = pthread_tryjoin_np(mReopenThread, &retval); ++ ret = pthread_join(mReopenThread, &retval); + if (ret != 0){ + Error("Could not join reopen thread."); + } +-- +2.1.0 + |