mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-18 22:07:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
17,713 Commits 80 Branches 104 Tags
aa53260a321e7020bfcd92c047bc30a3859dde60
Commit Graph

24 Commits

Author SHA1 Message Date
Isaac Connor
8d52baeee2 Merge branch 'master' into rtsp_server 
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1.  0 means no error but also no success.
Debugging and braces improvements in local_camera.
 2020-12-17 10:16:54 -05:00
Isaac Connor
03903d2dad spacing 2020-12-09 15:01:35 -05:00
Isaac Connor
a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Peter Keresztes Schmidt
8f980a1168 Convert NULL/0 to nullptr 
The 0 -> nullptr changes should definitely improve readability.
 2020-08-26 22:03:40 +02:00
Isaac Connor
869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor
a798e874fe Spacing 2020-05-07 13:44:32 -04:00
Isaac Connor
979b31ffc3 Merge branch 'storageareas' into zma_to_thread 2018-08-11 10:08:30 -04:00
Isaac Connor
316dbb5eb8 Implement a RecursiveMutex class which is an explicit Recursive Mutex. Change the db mutex to a recursive Mutex 2018-06-01 11:27:35 -04:00
Isaac Connor
c3053a2f8a Merge branch 'storageareas' into zma_to_thread 2018-05-10 17:51:38 -04:00
Isaac Connor
cdf53e36e9 Google code style 2018-05-07 11:07:58 -04:00
Isaac Connor
94377a4652 Merge branch 'storageareas' into zma_to_thread 2018-05-05 12:57:50 -04:00
Isaac Connor
c6fde10766 Implement trylock 2018-05-03 13:53:32 -04:00
Isaac Connor
cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04:00
Isaac Connor
65c69d419b google code style and remove throws from constructors and destructors 2018-04-12 10:24:47 -04:00
Isaac Connor
b5e0745ac7 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:03 -05:00
Isaac Connor
6e17bfefdd fix printouts on 32bit 2017-12-01 10:30:58 -05:00
Isaac Connor
556c4d8851 debug 2017-11-30 16:10:30 -05:00
Isaac Connor
f2efc80f22 works? 2017-11-30 14:37:36 -05:00
Isaac Connor
99968dfa2a Merge branch 'storageareas' into zma_to_thread 2017-11-27 11:28:36 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
24e3306955 master master 2016-04-28 09:20:56 -04:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor
ecce87b779 mamke status a member so that we aren't return the address of a local variable 2016-03-31 14:43:22 -04:00
nextime
33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00