1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
d1343df920
Change colour of privacy zones from black to dark grey
2015-08-26 07:45:45 +02:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02:00
14feffc455
strip the path from the filename
2015-08-21 18:28:50 -05:00
22dc049bf4
remove Info statement used for testing
2015-08-21 10:34:23 -05:00
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
acacd247c8
Really blacken all pixel colours
2015-08-20 17:17:58 +02:00
fc50b38331
collect variable name
2015-08-20 16:02:29 +02:00
52be185fc9
Support blacken zones in all colour depths
2015-08-20 15:58:13 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
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
2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -05:00
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
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3b9bb6053c
Add clarifying comment
2015-08-17 22:10:39 -04:00
9351e1b9d9
Incorporate exif switch
2015-08-17 22:07:41 -04:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
89e13c1cc0
leave 1 char at end for \0
2015-08-14 16:10:44 -04:00
5b0288e5f5
use frame_type instead of score in conditional
2015-08-14 07:03:08 -05:00
19174adfa1
add frame_type to debug message
2015-08-13 20:47:14 -05:00
14dabb095c
set scroe to zero if less than zero
2015-08-13 18:06:20 -05:00
95087beeb9
use return value of stat instead of just checking errno. This has the added benefit of catching other errors when stating
2015-08-12 11:00:41 -04:00
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
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
6aca6c8d26
Demote user auth info message to debug
2015-08-09 12:16:01 -04:00
5a0d0ca5a3
Made large font selectable by a constant
2015-08-06 17:42:52 +02:00
c733fec476
First (working) steps for adding large timestamp to images
2015-08-06 14:43:10 +02:00
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
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
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
2538514d18
Change from info to debug
2015-08-03 18:39:14 -04:00
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
f7cfa1ecd4
Fix analysis sample rate calculation
2015-07-28 23:07:02 +02:00
4dc0028e11
Clean up videostore code and remove lots of unused code
2015-07-28 21:41:10 +10:00
1e60fccd81
Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
...
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
2015-07-28 21:39:47 +10:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
93990b253f
Use a dedicated pre event buffer if analysis_fps is set
2015-07-27 16:24:32 +02:00
18758826c7
Do not call time() function when it is not necessary
2015-07-25 13:46:11 +02:00
0bff99f5c7
Improve string conversion and use unsigned type for analysis_update_delay
2015-07-25 13:38:50 +02:00
3e5f6c65d3
Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height
2015-07-24 13:30:58 -04:00
965425c395
Remove extraneous file
2015-07-23 19:37:23 -04:00
72a92ee9d5
Add exif to jpg images saved
2015-07-23 19:34:39 -04:00
9e16c8a066
Improve log message and logic in UpdateAdaptiveSkip()
2015-07-24 01:01:51 +02:00
3b2378c21d
Add a new warning in GetAnalysisRate function
2015-07-24 00:26:53 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
9f1d91b655
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-20 16:28:59 -04:00
dfd3d2c4cd
use std::string to build sql for loading monitors. ALso use new ZmDbFetch functions
2015-07-20 16:28:21 -04:00
633a6e2df9
use zmDbFetchOne more
2015-07-16 16:53:30 -04:00
60410c98d6
use new db functions in zm_config.cpp
2015-07-16 16:44:09 -04:00
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
48fa0c3d42
add some utility db functions
2015-07-16 13:04:28 -04:00
4ed248e5a5
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:05:21 -04:00
50b333fb28
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:04:56 -04:00
3481368574
given SERVER_NAME populate SERVER_ID and vice versa
2015-07-15 16:44:16 -04:00
a9035221cb
Merge pull request #934 from ZoneMinder/fix_utf
...
fix utf8 ' characters
2015-07-15 10:30:28 -05:00
33a9fc6175
fix utf8 ' characters
2015-07-15 10:37:08 -04:00
602f703df8
roudn up when calculating buffer size for scaled image. Fixes #932
2015-07-15 10:22:57 -04:00
bce968ebd8
Merge pull request #923 from ZoneMinder/zm_buffer_improvements
...
Introduce a read_into function in the Buffer.
2015-07-13 18:51:38 -05:00
8b2f67c456
don't include .cpp in man
2015-07-13 11:30:32 -04:00
561bf43721
fix pod2man generation for out-of-source builds
2015-07-09 19:33:06 -05:00
994de4ae0a
Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available.
2015-07-06 15:57:06 -04:00
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
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10: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
0aa20ed6e8
Remove pict from writeAudioFramePacket as not used
2015-03-22 21:03:25 +11:00
b587222ce5
bring recent improvements in ffmpeg capture function into captureandrecord
2015-03-22 21:02:02 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11: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
3cc4c2e24d
fixes to get pid on FreeBSD
2015-02-24 09:22:08 -05:00
0bea381510
sendfile tricks
2015-02-24 09:20:55 -05:00
4394bb0a9a
Make zms not crash when zmc is not running.
2015-02-22 16:58:15 -05:00
550d517701
sigh... fix the image to capture_image
2015-02-22 16:36:01 -05:00
2f3104aada
fix debug line
2015-02-22 16:29:36 -05:00
3e33bc2627
This is actually from freebsd... but it's just a more informative error message
2015-02-22 15:01:32 -05:00
0355191c6c
Merge pull request #687 from knnniggett/rtsp-content-base
...
process RTSP DESCRIBE response header
2015-02-21 17:44:49 -05:00
5994811f88
Allow zm to build w/o ffmpeg
2015-02-21 11:02:38 -06:00
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
83cc398a24
Added libavformat version check around free context functions
2015-02-18 23:25:31 +11:00
e807560d86
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-17 11:47:30 -05:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
4439187f19
Better debug output, handle ENOTTY in STANDARD ENUMERATION
2015-02-10 11:53:50 -05:00
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
4613fd46a4
fix a reorder warning
2015-02-05 11:03:26 -05:00
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
65701f0956
add missing +
2015-02-04 14:22:53 -05:00
4c7e8592d0
fix content-type parsing when there are options on it
2015-02-04 13:53:42 -05:00
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
1abe35c576
change Debug level of this line to something higher
2015-02-03 14:33:23 -05:00
d2865f625b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-02 19:06:57 -05:00
82af43f5fb
process RTSP DESCRIBE response header
2015-01-31 08:31:27 -06:00
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
7e685bb04a
Merge pull request #675 from ZoneMinder/small_performance_improvement
...
small performance improvement when streaming.
2015-01-29 16:27:34 -05:00
da54867ea2
better log message, trivial
2015-01-29 16:21:43 -05:00
9d636ad128
fix zms crash due to buffer_copy_size never being initialized
2015-01-29 15:32:50 -05:00
321196e206
fix to reset timeout flag upon receiving something
2015-01-28 14:04:31 -05:00
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
56c82cfbb5
Save 1 or more calls to time(NULL)
2015-01-28 12:33:05 -05:00
facda38871
add corresponding free
2015-01-13 19:52:15 -05:00
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
ba425edd0f
Convert from event_directory to event file as per Video branch
2015-01-12 20:42:17 +10:00
f1fa8a3d92
fix typo
2015-01-08 12:48:19 -06:00
53244aff0d
Don't fail if an unexpected rtp packet type is received
2015-01-07 16:01:38 -06:00
1adb147899
add version command line argument to zmstreamer. Also add -h for consistency with other programs
2015-01-06 20:59:03 -05:00
258c97f75f
add version command line argument to zmf
2015-01-06 20:54:49 -05:00
85e51528a6
add version command line argument to zma
2015-01-06 20:52:18 -05:00
6f42f1c6d8
add version command line argument to zmc
2015-01-06 20:49:33 -05:00
25bfedc9d6
Clean up comments and add av_free_packet
2015-01-06 15:15:14 +10:00
56b1a50b2b
revert
2015-01-03 14:07:18 -05:00
af570259d1
got these swapped, should be the other way around
2015-01-03 13:59:23 -05:00
14c65aefd2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
...
Conflicts:
src/zm_comms.cpp
2015-01-03 13:56:40 -05:00
e02da8833a
ifdef's for BSD
2015-01-02 17:08:51 -05:00
92e6d940bc
ifdef's for BSD and cleanup
2015-01-02 17:07:49 -05:00
1137c3907e
ifdef's for BSD
2015-01-02 17:06:16 -05:00
e460c6f448
BSD uses some different includes, these are from FreeBSD ports
2015-01-01 17:18:12 -05:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
cc305ec8b6
Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
2014-12-25 07:58:01 +10:00
53c7e02d78
Update VideoStoreData memory size comment
2014-12-25 05:52:34 +11:00
d6e8c66057
Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
2014-12-25 05:45:50 +11:00
26d7fd87e2
Whitespace fix zm_camera.h
2014-12-19 07:27:25 +11:00
f076104c94
Fix whitespace
2014-12-19 07:19:08 +11:00
62b75808b3
Output to stderror when zmu can't read zm.conf
2014-12-10 17:54:09 -06:00
48f4d7eb93
Merge branch 'master' into BSD_device
2014-12-08 16:53:39 -05:00
97ee989a94
Parse multiple streams in RTP-Info
2014-12-02 19:33:05 -06:00
33ff712f2c
Resolve post merge build issues with braces
2014-12-02 22:36:32 +11:00
add8f76553
Merge branch 'feature-h264-videostorage' into Video-Highlander-Branch
2014-12-02 22:20:51 +11:00
4a492ce088
Fix some issues from the merge conflict
2014-12-02 21:49:50 +11:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11:00
a6a779978a
move seq and rtpTime declarations outside conditional
2014-12-01 17:21:49 -06:00
0099b54248
Make lack of RTP-Info non-fatal
2014-12-01 17:15:08 -06:00
4a248cc3aa
add rtsp mediatype of application
2014-12-01 17:05:10 -06:00
32e818e860
Check for RTSP timeout in PLAY command response
2014-12-01 16:58:42 -06:00
02cdc37e3c
Merge pull request #607 from manupap1/memory_fix_leaks
...
Fix some memory leaks in zma
2014-11-29 10:18:17 -05:00
51aa4e67ea
Merge pull request #608 from knnniggett/RTSP_mUrl
...
echo the URL to the RTSP device during the OPTIONS directive
2014-11-29 10:14:26 -05:00
e4fa475d87
Merge pull request #588 from ZoneMinder/digest_auth
...
Digest auth
2014-11-29 08:32:08 -06:00
1cff253dde
echo the URL to the RTSP device during the OPTIONS directive
2014-11-29 08:13:06 -06:00
346015f472
Fix some indentations in zm_monitor.h
2014-11-29 14:39:57 +01:00
c313e2e389
Fix a memory leak in Monitor::Analyse()
2014-11-29 06:06:10 +01:00
73b25a1de0
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches
2014-11-29 03:39:05 +01:00
41edb4d958
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks
2014-11-29 03:38:45 +01:00
e6d47781d3
add Digest Authentication handling for simple http method.
2014-11-28 15:56:58 -05:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
87c741b165
Merge pull request #574 from manupap1/rtsp_fix
...
Fix memory leaks with rtsp and a bug
2014-11-26 15:13:39 -05:00
Isaac Connor
Robin Daermann
Andrew Bauer
Isaac Connor
Linwood-F
Emmanuel Papin
SteveGilvarry
Andrew Bauer
Steve Gilvarry
Rick Sayre
Isaac Connor
rwg0
Isaac Connor
Dmitry Smirnov
Sune1337
balr0g