mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-05 05:06:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,107 Commits 90 Branches 104 Tags
f322bde35c75da86b217472eb09e7ea42becf0e5
Commit Graph

1138 Commits

Author SHA1 Message Date
SteveGilvarry
477e63a878 Reorder RTSPDescribe to avoid -wreorder warnings 2015-11-05 17:19:58 +11:00
SteveGilvarry
5ba13f1a76 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
 2015-11-04 16:24:39 +11:00
SteveGilvarry
51914994f7 Migrating from av_free/av_freep to av_frame_free using libavcodec version 
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
 2015-11-04 15:30:14 +11:00
SteveGilvarry
bc5ef6c599 Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
 2015-11-04 12:46:26 +11:00
Dmitry Smirnov
0ff7a4e616 Replace deprecated FFmpeg API 
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.

Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
 2015-11-03 11:58:23 +11:00
baffo32
44cda8032b Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall 2015-10-24 20:07:42 -04:00
Isaac Connor
24b79e81bc add include for basename on freebsd 2015-10-02 11:00:42 -04:00
Isaac Connor
8125ef0334 change types and move things around to remove compile warnings 2015-10-02 09:49:09 -04:00
Dmitry Smirnov
333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Andrew Bauer
4a978034ad Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults 
Fix sgfault caused by the privacy mask stuff
 2015-09-16 10:46:45 -05:00
Isaac Connor
6e12febf3d initialize privacy_bitmask and check it before deletep[] to prevent segfault 2015-09-16 10:51:27 -04:00
Isaac Connor
0571ca3025 quick fix for #1055: make sure our mmap fd is > 2 2015-09-16 09:11:22 -04:00
Andy Bauer
395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-29 07:57:18 -05:00
Isaac Connor
1cf54d2e38 Merge pull request #1026 from schrorg/blacken-zones 
Add new zone type - privacy zones
 2015-08-27 09:14:16 -04:00
Robin Daermann
d1343df920 Change colour of privacy zones from black to dark grey 2015-08-26 07:45:45 +02:00
Robin Daermann
2aca87654a Remove unneccessary parameter in constructor 2015-08-26 07:44:50 +02:00
Andrew Bauer
14feffc455 strip the path from the filename 2015-08-21 18:28:50 -05:00
Andrew Bauer
22dc049bf4 remove Info statement used for testing 2015-08-21 10:34:23 -05:00
Andrew Bauer
a2d7ac86fe add rtsp_describe to RtspThread class 2015-08-21 10:29:54 -05:00
Robin Daermann
5b465194f8 Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
Robin Daermann
acacd247c8 Really blacken all pixel colours 2015-08-20 17:17:58 +02:00
Robin Daermann
fc50b38331 collect variable name 2015-08-20 16:02:29 +02:00
Robin Daermann
52be185fc9 Support blacken zones in all colour depths 2015-08-20 15:58:13 +02:00
Robin Daermann
6fc4525784 Blacken Zones are now correctly displayed 2015-08-20 15:01:07 +02:00
Robin Daermann
8f9ed96585 First try to implement blacken areas for monitors 2015-08-20 14:20:41 +02:00
Andrew Bauer
fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Andrew Bauer
2600b96f1b fix merge conflict in zm_monitor.cpp 2015-08-18 14:19:46 -05:00
Andrew Bauer
68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Linwood-F
987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Linwood-F
99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Linwood-F
3b9bb6053c Add clarifying comment 2015-08-17 22:10:39 -04:00
Linwood-F
9351e1b9d9 Incorporate exif switch 2015-08-17 22:07:41 -04:00
Robin Daermann
299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Andrew Bauer
59c1b83d4f create embed_exif flag in Monitor class 2015-08-16 17:42:12 -05:00
Andrew Bauer
5b0288e5f5 use frame_type instead of score in conditional 2015-08-14 07:03:08 -05:00
Andrew Bauer
19174adfa1 add frame_type to debug message 2015-08-13 20:47:14 -05:00
Andrew Bauer
14dabb095c set scroe to zero if less than zero 2015-08-13 18:06:20 -05:00
Robin Daermann
3368d4f474 Removed untranslated "Font size" from language files, corrected white 
space and make font size a const int
 2015-08-10 15:35:19 +02:00
Robin Daermann
7f3a07f21b Add label size to monitor options (database and backend part) 
This commit bumps version to 1.28.101 because of database schema change
 2015-08-10 15:35:18 +02:00
Linwood-F
6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Robin Daermann
5a0d0ca5a3 Made large font selectable by a constant 2015-08-06 17:42:52 +02:00
Robin Daermann
c733fec476 First (working) steps for adding large timestamp to images 2015-08-06 14:43:10 +02:00
Isaac Connor
d9ee08a27b Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug 
Change from info to debug
 2015-08-04 10:12:08 -04:00
Isaac Connor
a36bee3767 Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning 
Remove shared data warning for purpose query only
 2015-08-04 10:09:59 -04:00
Linwood-F
546b0dd353 Remove shared data warning for purpose query only 2015-08-03 20:37:17 -04:00
Linwood-F
2538514d18 Change from info to debug 2015-08-03 18:39:14 -04:00
Isaac Connor
46b9bd5d1c change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined. 2015-07-31 10:29:53 -04:00
Emmanuel Papin
f7cfa1ecd4 Fix analysis sample rate calculation 2015-07-28 23:07:02 +02:00
Emmanuel Papin
93990b253f Use a dedicated pre event buffer if analysis_fps is set 2015-07-27 16:24:32 +02:00
Emmanuel Papin
18758826c7 Do not call time() function when it is not necessary 2015-07-25 13:46:11 +02:00