Andrew Bauer
d5e403b7e0
Merge pull request #775 from ZoneMinder/freebsd_fixes
...
Freebsd fixes
2015-04-17 15:21:42 -05:00
Isaac Connor
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
Dmitry Smirnov
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
Andrew Bauer
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
Andrew Bauer
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
Andrew Bauer
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
Isaac Connor
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
Sune1337
5779b2e20f
* use pthread_join instead of pthread_tryjoin_np
2015-04-08 22:15:54 +02:00
Andrew Bauer
549d7fd426
include libv4l1-videodev headers
2015-04-03 18:24:51 -05:00
balr0g
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
Isaac Connor
21915eb92c
Merge branch 'master' into freebsd_fixes
2015-03-31 11:06:53 -04:00
Dmitry Smirnov
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
Isaac Connor
ed28eebba4
This is already included in zm_signal.h
2015-03-27 15:16:15 -04:00
Isaac Connor
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
Isaac Connor
084e2a8b8f
when auth is needed, try command again before dying.
2015-03-02 10:47:52 -05:00
Isaac Connor
3c5b1fd07f
fix extra slash when adding trackurl to controlurl
2015-02-26 10:22:21 -05:00
Isaac Connor
c7dc157f4d
FreeBSD fix
2015-02-24 09:22:55 -05:00
Isaac Connor
52938920de
backtrace is in execinfo on FreeBSD
2015-02-24 09:22:39 -05:00
Isaac Connor
3cc4c2e24d
fixes to get pid on FreeBSD
2015-02-24 09:22:08 -05:00
Isaac Connor
0bea381510
sendfile tricks
2015-02-24 09:20:55 -05:00
Isaac Connor
550d517701
sigh... fix the image to capture_image
2015-02-22 16:36:01 -05:00
Isaac Connor
2f3104aada
fix debug line
2015-02-22 16:29:36 -05:00
Isaac Connor
3e33bc2627
This is actually from freebsd... but it's just a more informative error message
2015-02-22 15:01:32 -05:00
Isaac Connor
0355191c6c
Merge pull request #687 from knnniggett/rtsp-content-base
...
process RTSP DESCRIBE response header
2015-02-21 17:44:49 -05:00
Andrew Bauer
5994811f88
Allow zm to build w/o ffmpeg
2015-02-21 11:02:38 -06:00
Andrew Bauer
6c65c89643
Merge pull request #711 from SteveGilvarry/720_avformat_free_context_version_check
...
Fixes #710 Added libavformat version check around free context functions
2015-02-18 07:26:18 -06:00
SteveGilvarry
83cc398a24
Added libavformat version check around free context functions
2015-02-18 23:25:31 +11:00
Isaac Connor
e807560d86
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-17 11:47:30 -05:00
Isaac Connor
4439187f19
Better debug output, handle ENOTTY in STANDARD ENUMERATION
2015-02-10 11:53:50 -05:00
Isaac Connor
e713aa44f4
small improvements:
...
First is some more debugging lines useful for figuring out why automatica palette selection didn't work.
The other is a comment about how the code will segfault if there are more than 64 formats. Currently there are not.
Lastly witch a variable from int to unsigned int. There is no way for it to go negative and logically should always be positive, so by making it an unsigned in we don't have to cast it later.
2015-02-10 11:11:54 -05:00
Isaac Connor
4613fd46a4
fix a reorder warning
2015-02-05 11:03:26 -05:00
Andrew Bauer
92b3cdbadb
Merge pull request #691 from ZoneMinder/rtsp_auth_fixes
...
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
2015-02-04 13:46:37 -06:00
Isaac Connor
65701f0956
add missing +
2015-02-04 14:22:53 -05:00
Isaac Connor
4c7e8592d0
fix content-type parsing when there are options on it
2015-02-04 13:53:42 -05:00
Isaac Connor
b22608fb07
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
...
Digest Auth worked for the RTSP stream, but not http.
This adds quotes around the cnonce value, which matches what curl and wget do and adds the algorithm line which also matches what curl and wget do. With these two changes the auth is accepted.
2015-02-04 13:50:19 -05:00
Isaac Connor
1abe35c576
change Debug level of this line to something higher
2015-02-03 14:33:23 -05:00
Isaac Connor
d2865f625b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-02 19:06:57 -05:00
Andrew Bauer
82af43f5fb
process RTSP DESCRIBE response header
2015-01-31 08:31:27 -06:00
Isaac Connor
c2d429aae0
Add some comments, change log level of some debug lines. Don't die on a timeout.
2015-01-30 09:44:10 -05:00
Isaac Connor
7e685bb04a
Merge pull request #675 from ZoneMinder/small_performance_improvement
...
small performance improvement when streaming.
2015-01-29 16:27:34 -05:00
Isaac Connor
da54867ea2
better log message, trivial
2015-01-29 16:21:43 -05:00
Isaac Connor
9d636ad128
fix zms crash due to buffer_copy_size never being initialized
2015-01-29 15:32:50 -05:00
Isaac Connor
321196e206
fix to reset timeout flag upon receiving something
2015-01-28 14:04:31 -05:00
Isaac Connor
b97f2fa4f6
Send an RTCP RR packet when we get a timeout to see if we are really dead.
2015-01-28 12:36:11 -05:00
Isaac Connor
56c82cfbb5
Save 1 or more calls to time(NULL)
2015-01-28 12:33:05 -05:00
Isaac Connor
facda38871
add corresponding free
2015-01-13 19:52:15 -05:00
Isaac Connor
509de3ec27
need to cast malloc, get rid of perl code, only swap_path checks if we are going to use it
2015-01-13 15:16:38 -05:00
Andrew Bauer
f1fa8a3d92
fix typo
2015-01-08 12:48:19 -06:00
Andrew Bauer
53244aff0d
Don't fail if an unexpected rtp packet type is received
2015-01-07 16:01:38 -06:00
Isaac Connor
1adb147899
add version command line argument to zmstreamer. Also add -h for consistency with other programs
2015-01-06 20:59:03 -05:00
Andrew Bauer