9590044e72
fix crashes
2014-11-14 17:26:14 +01:00
ebe4842ec2
fix another segfault
2014-11-14 17:26:13 +01:00
ed7efc04d8
spaces vs tabs are important in rules, debian is more picky than ubuntu
...
fix placement of an if to prevent accessing unmapped mem_ptr
2014-11-14 17:25:33 +01:00
dd2f85fe6f
Improve error messages when empty mmap file to reduce FAQ
2014-11-14 17:20:57 +01:00
2bf9080ca9
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-11-14 17:17:09 +01:00
5cc74c3941
change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi
2014-11-14 17:17:09 +01:00
c80bf07ea7
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-11-14 17:17:09 +01:00
ef19ed2e23
only do mmap on demand
2014-11-14 17:17:09 +01:00
3a9f814303
Merge pull request #572 from ZoneMinder/buffer_cleanup
...
remove the case for level >= 2. Since level is a bool, this code can ne...
2014-11-13 15:47:37 -06:00
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
72f34203a0
remove the case for level >= 2. Since level is a bool, this code can never execute. Also, there are no calls to tidy in the current code with values other than 0 or 1, so it's safe to do. Also it removes an error message when using clang++
2014-11-13 14:41:49 -05:00
1d6dffde47
Merge pull request #560 from manupap1/rtsp_fix
...
Send keepalive messages if the rtsp server supports this feature
2014-11-08 14:53:45 -05:00
b4a8ba8e8e
Merge pull request #561 from manupap1/rtsp_fix2
...
Use our own SSRC when sending packets on the RTP control stream
2014-11-08 14:52:36 -05:00
3e8d49d88d
add comment to improve understanding
2014-11-08 14:50:44 -05:00
336c69e3c0
Use our own SSRC when sending packets on the control stream
2014-11-07 19:38:11 +01:00
ea8b93be84
Use our own SSRC when sending packets on the control stream
2014-11-07 19:15:42 +01:00
ee7d6a6254
Send keepalive messages if the rtsp server supports this feature
2014-11-07 17:39:50 +01:00
23ee96c966
Merge pull request #556 from ZoneMinder/add_join
...
Add a stringVector join function for future use
2014-11-06 08:33:28 -06:00
e764938a0d
Fixed bug in rtsp streaming caused by a bad string concatenation
2014-11-06 10:16:28 +01:00
a88ce80716
Add a stringVector join function for future use
2014-11-05 14:01:48 -05:00
fefc17b0fc
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.
2014-11-05 19:08:57 +01:00
57e5b4fee8
Fix segfault on zmu -l due to not connectig to the shared mem
2014-10-23 09:00:53 -04:00
8a33f78243
bugfix; coredump if no codec name was specified in url.
2014-10-15 14:35:01 -04:00
2a71973307
make zm compile using libav on ubunut 14.04
2014-10-15 13:23:29 -04:00
6cb96f1316
Put opts back in
2014-10-12 16:47:27 +11:00
7534557533
- join reconnect thread when finished to clean up thread resources.
...
- don't spawn a new thread for every attempt to open a stream while reconnecting.
2014-10-12 16:31:27 +11:00
a865a555f2
Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists.
2014-10-12 16:31:27 +11:00
f32b1276df
Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined.
2014-10-12 16:23:58 +11:00
83d2a494c3
Process should exit if ReopenFfmpeg function fails to create a worker thread.
2014-10-12 16:23:58 +11:00
7de59df080
removed use of av_err2str. someone could not compile when using that macro.
2014-10-12 16:23:58 +11:00
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
ebf466c2df
- Timeout when opening stream after 10 seconds
...
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
2014-10-12 16:23:58 +11:00
0bb2d9f81d
Merge pull request #407 from m-bene/rtspDigest
...
Rtsp digest
2014-10-11 17:39:57 -05:00
9ef9b17c6b
fixes ftbs with no ffmpeg support
2014-10-11 17:14:09 -05:00
549360cabd
Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements
...
Conflicts:
src/zm_ffmpeg.h
src/zm_mpeg.cpp
2014-10-11 15:38:38 -05:00
c9e04e48bb
Am remarking out some Debugs that would only be useful to someone debugging image code. Of no use to end users and get called so much that must cause a performance problem, especially when debug logging is actually turned on
2014-09-18 15:44:53 -04:00
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
8891639767
fix another segfault
2014-09-08 16:46:41 -04:00
9a3b685016
fixes for vl_multi_buffer parsing when column is NULL
...
fix in debug output for local cameras causing a segfault
2014-09-08 15:20:35 -04:00
6aa1798293
fix segfault for local cameras... strangely enough, in C you should treat an integer as a pointer to string
2014-09-07 17:18:29 -04:00
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
5a7c989ccd
remove some crap that I pushed
2014-08-21 11:52:35 -04:00
c6d19b3ecf
whitespace issue
2014-08-21 11:14:38 -04:00
3d8ad2c906
fall back to Config table setting for v4l MultiBUgger and captures per frame.
2014-08-21 09:59:08 -04:00
92d110859d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-08-19 09:12:45 -04:00
5bc7242582
spaces vs tabs are important in rules, debian is more picky than ubuntu
...
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
6d92299d46
Merge pull request #440 from kylejohnson/master
...
Cleaning up the Contribution section of the README
2014-08-12 11:13:46 -04:00
cca01dc357
connect to the monitor, because instantiating the object no longer does that
2014-07-30 14:20:48 -04:00
2087780ec1
tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
2014-07-29 14:43:13 -04:00
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
manupap1
SteveGilvarry
Sune1337
Sune1337
Andrew Bauer
Kyle Johnson
root