39d152656a
Merge pull request #920 from ZoneMinder/zms_no_crash
...
Zms no crash
2015-07-04 06:58:32 +10:00
58448adb51
Merge pull request #896 from knnniggett/pod2man
...
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
3c5a9b796b
Merge branch 'master' into zms_no_crash
2015-07-03 11:34:42 -04:00
956e2936a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-25 16:26:49 -04:00
2030b5e6ef
Merge pull request #870 from ZoneMinder/better_http_reading
...
alter the logic of ReadData. New behaviour is documented.
2015-06-23 08:16:44 -05:00
c3fa7ea940
Merge pull request #867 from ZoneMinder/analysis_image_optimisation
...
analysis optimisations
2015-06-23 08:13:34 -05:00
ec6c6b3ace
typo fix
2015-06-22 09:26:17 -04:00
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
4deb0d53c8
Add pod documentation to C binaries
2015-06-20 17:11:20 -05:00
846bea2aa6
Merge pull request #866 from ZoneMinder/no_death_on_db_disconnect_in_logger
...
Don't die if db goes away during logging
2015-06-11 15:17:50 +02:00
249b9e2952
Merge pull request #875 from ZoneMinder/add_version_to_startup_log
...
Add version to the startup log line
2015-06-11 15:12:00 +02:00
c391325457
Merge pull request #858 from manupap1/fix_avcodec_warnings
...
Fix detection of deprecated libav / ffmpeg functions
2015-06-08 10:26:35 -04:00
a534e66437
Add version to the startup log line
2015-06-08 10:24:40 -04:00
95d7a3ff94
alter the logic of ReadData. New behaviour is documented. This solves unneccessary disconnects for me.
2015-06-04 11:33:03 -04:00
0308baabb3
This change uses a member Image instead of constantly allocation a new Image.
...
This saves all the initialisation and the lines of debug.
Also in GetImage we potentially remove and entire copy if no scaling or timestamping is being done.
2015-06-03 15:10:52 -04:00
b91d1c7b0c
Don't die if db goes away during logging
2015-06-03 14:57:19 -04:00
7811354d92
Move iostream inclusion in zm.h and declare explicitely the namespace for cout
2015-05-29 23:22:20 +02:00
818a5256e4
Readd checking of micro version in zm_mpeg.cpp to fix compilation issue
2015-05-29 19:23:00 +02:00
f6d69e02b5
Mention original source for check functions
2015-05-29 17:45:35 +02:00
a36b4aa65d
Implement version check for ffmpeg and libav (address issue #580 )
2015-05-29 17:38:02 +02:00
45b5fd3945
Merge pull request #801 from knnniggett/nph-zms
...
link zms to nph-zms, rather than build identical
2015-05-21 13:15:38 -04:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
5ded77f8de
Merge pull request #825 from rwg0/688-fix-fast-forward
...
Fix fast forward/reverse in event playback (#688 )
2015-05-09 19:39:23 -05:00
79398a2bec
Merge pull request #821 from onlyjob/PBP
...
beautifying *.pm
2015-05-08 08:56:01 -04:00
ea795c4040
Fix to compile on 32bit kFreeBSD
2015-04-24 13:55:10 -04:00
422020a3b2
Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps
2015-04-22 22:11:33 +01:00
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
d5e403b7e0
Merge pull request #775 from ZoneMinder/freebsd_fixes
...
Freebsd fixes
2015-04-17 15:21:42 -05:00
0c0a23bf86
Merge pull request #778 from onlyjob/build-hurd
...
build: add PATH_MAX definitions (needed on GNU Hurd)
2015-04-16 01:00:00 -04:00
0a2f1cd2b6
build: add PATH_MAX definitions (needed on GNU Hurd)
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-16 11:25:04 +10:00
fc64e3f01b
Merge pull request #772 from balr0g/linked-cameras-trigger-on-new-events
...
Don't trigger linked cameras on new events
2015-04-15 20:23:54 -05:00
e4cf323949
Merge pull request #800 from Sune1337/pthread_join
...
* use pthread_join instead of pthread_tryjoin_np
2015-04-12 11:51:50 -05:00
4cb8cf8681
remove commented commands
2015-04-12 11:48:49 -05:00
3a3f186e74
update working_directory
2015-04-12 11:48:18 -05:00
8f337999d4
remove nph-zms target
2015-04-12 11:47:28 -05:00
3108fd2109
link nph-zms rather than build
2015-04-12 11:00:43 -05:00
124ba1c2a8
Merge pull request #796 from ZoneMinder/zm_image_cleanups
...
one small fix for a log line where the 4th parameter wasn't included. T...
2015-04-10 12:38:35 -05:00
065a372678
one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations.
2015-04-10 13:26:17 -04:00
5779b2e20f
* use pthread_join instead of pthread_tryjoin_np
2015-04-08 22:15:54 +02:00
549d7fd426
include libv4l1-videodev headers
2015-04-03 18:24:51 -05:00
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
21915eb92c
Merge branch 'master' into freebsd_fixes
2015-03-31 11:06:53 -04:00
6bbe42c5eb
build: fix FTBFS with format-hardening
...
~~~~
x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -I/usr/include -D__STDC_CONSTANT_MACROS -Wall -finline-functions -fomit-frame-pointer -I/usr/include -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_mpeg.o -MD -MP -MF .deps/zm_mpeg.Tpo -c -o zm_mpeg.o zm_mpeg.cpp
zm_mpeg.cpp: In member function ‘void VideoStream::SetupFormat()’:
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
snprintf( s->filename, sizeof(s->filename), filename );
^
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
~~~~
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:27:37 +11:00
ed28eebba4
This is already included in zm_signal.h
2015-03-27 15:16:15 -04:00
2e10263b64
Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1
2015-03-04 16:34:31 -05:00
084e2a8b8f
when auth is needed, try command again before dying.
2015-03-02 10:47:52 -05:00
3c5b1fd07f
fix extra slash when adding trackurl to controlurl
2015-02-26 10:22:21 -05:00
c7dc157f4d
FreeBSD fix
2015-02-24 09:22:55 -05:00
52938920de
backtrace is in execinfo on FreeBSD
2015-02-24 09:22:39 -05:00
Steve Gilvarry
Isaac Connor
Isaac Connor
Andrew Bauer
Andrew Bauer
Emmanuel Papin
Rick Sayre
Isaac Connor
rwg0
Isaac Connor
Dmitry Smirnov
Sune1337
balr0g