mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-22 15:52:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,731 Commits 80 Branches 104 Tags
7de59df080375ee41e8e706e82c0e6e77bfb935a
Commit Graph

925 Commits

Author SHA1 Message Date
Sune1337
7de59df080 removed use of av_err2str. someone could not compile when using that macro. 2014-10-12 16:23:58 +11:00
Sune1337
a307b8a1e3 Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file. 2014-10-12 16:23:58 +11:00
Sune1337
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
Andrew Bauer
0bb2d9f81d Merge pull request #407 from m-bene/rtspDigest 
Rtsp digest
 2014-10-11 17:39:57 -05:00
Andrew Bauer
9ef9b17c6b fixes ftbs with no ffmpeg support 2014-10-11 17:14:09 -05:00
Andy Bauer
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
Isaac Connor
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
Isaac Connor
1076a621c8 fix crashes 2014-09-08 16:56:40 -04:00
Isaac Connor
8891639767 fix another segfault 2014-09-08 16:46:41 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
83870b911d debugging in progress but builds 2014-08-21 11:53:14 -04:00
Isaac Connor
5a7c989ccd remove some crap that I pushed 2014-08-21 11:52:35 -04:00
Isaac Connor
c6d19b3ecf whitespace issue 2014-08-21 11:14:38 -04:00
Isaac Connor
3d8ad2c906 fall back to Config table setting for v4l MultiBUgger and captures per frame. 2014-08-21 09:59:08 -04:00
Isaac Connor
92d110859d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-08-19 09:12:45 -04:00
Isaac Connor
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
Kyle Johnson
6d92299d46 Merge pull request #440 from kylejohnson/master 
Cleaning up the Contribution section of the README
 2014-08-12 11:13:46 -04:00
root
cca01dc357 connect to the monitor, because instantiating the object no longer does that 2014-07-30 14:20:48 -04:00
Isaac Connor
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
Isaac Connor
7147d47a76 Improve error messages when empty mmap file to reduce FAQ 2014-07-29 09:45:19 -04:00
Isaac Connor
585a1c50a1 Merge branch 'nommap' 2014-07-24 14:40:37 -04:00
Isaac Connor
edd794a993 ensure captures_per_frame >0 
add missing lang entries for MultiBuffer and CapturesPerFrame
 2014-07-14 14:07:28 -04:00
Isaac Connor
4f694ee8cf fix 2014-07-14 13:07:23 -04:00
Isaac Connor
99a3684fb5 change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi 2014-07-14 12:53:48 -04:00
Isaac Connor
9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Andrew Bauer
9163536219 Merge pull request #358 from knnniggett/prevbutton 
Fix prev button while in gapless mode.  All buttons tested and working.
 2014-07-04 10:33:05 -05:00
Isaac Connor
6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Isaac Connor
07dbbd46d3 only do mmap on demand 2014-06-26 14:54:47 -04:00
Isaac Connor
8f4fb8bb64 fix mysql_escape_String call. Must use strlen, not sizeof 2014-06-26 14:44:37 -04:00
Isaac Connor
20bccdf431 use the size of the username and password when calling mysql_escape_string 2014-06-25 16:23:10 -04:00
Isaac Connor
0592276f53 fix mysql_escape_string calls after referring to docs 2014-06-24 11:22:08 -04:00
Kyle Johnson
229cfcaa5b Find the last occurrence of '@' in the host string. Fixes #443 2014-06-23 14:22:27 -04:00
Kfir Itzhak
a9cd6caeaf Minor corrections to cURL code 2014-06-06 09:35:02 +03:00
Isaac Connor
93aed26a00 escape username and password inside zm_user 
by rogerroger288
 2014-06-05 15:18:02 -04:00
Kfir Itzhak
5fea101294 Merge pull request #421 from m-bene/ffmpegoptions 
Add optional options field for ffmpeg and VLC source types
 2014-05-18 18:07:42 +03:00
m-bene
a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene
f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene
9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene
1b4f9c082c change check for av_dict_set success 2014-05-15 16:01:29 +02:00
m-bene
6016206f98 modify debug message 2014-05-15 15:42:27 +02:00
m-bene
5cb7cd916f add quotes to option debug/warn messages 2014-05-15 15:13:39 +02:00
m-bene
c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02:00
Isaac Connor
00aad4a128 frame_count should be an integer so don't use NULL 2014-05-05 13:06:58 -04:00
Isaac Connor
8333e909ed Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-05-05 11:29:55 -04:00
Isaac Connor
a8929914bb add a NULL test for frame_coutn before calling atoi. 2014-05-05 11:29:09 -04:00
m-bene
ae0ee9b3b3 testing/fixing 2014-05-05 15:54:13 +02:00
m-bene
ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Kfir Itzhak
4de46c7988 Fix wrong values used for type boolean 2014-05-05 09:26:32 +03:00
aztazt
e916ce22d9 Update zm_jpeg.cpp 
Change 0 to FALSE in order to avoid compiling error on Debian Wheezy:

[ 31%] Building CXX object src/CMakeFiles/zm.dir/zm_image.cpp.o
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::WriteJpeg(const char*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:863:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::EncodeJpeg(JOCTET*, int*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:1096:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
make[2]: *** [src/CMakeFiles/zm.dir/zm_image.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zm.dir/all] Error 2
make: *** [all] Error 2
 2014-05-04 02:35:17 +02:00