Commit Graph

3947 Commits

Author SHA1 Message Date
Sune1337 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
Sune1337 f32b1276df Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined. 2014-10-12 16:23:58 +11:00
Sune1337 83d2a494c3 Process should exit if ReopenFfmpeg function fails to create a worker thread. 2014-10-12 16:23:58 +11:00
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 810cf1aed3 Merge pull request #530 from knnniggett/ffmpeg
fixes ftbs with no ffmpeg support
2014-10-11 17:29:05 -05:00
Andrew Bauer 9ef9b17c6b fixes ftbs with no ffmpeg support 2014-10-11 17:14:09 -05:00
Andy Bauer f4b248a711 Merge branch 'Sune1337-zms/videostream-improvements' 2014-10-11 15:39:07 -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
Andrew Bauer e57b130293 Merge pull request #527 from SteveGilvarry/498-DockerContainer-Broken
498-Docker-Container-Broken
2014-10-11 08:27:53 -05:00
SteveGilvarry 820208c2ef Removed line adding Universe repo as already in images 2014-10-11 17:29:46 +11:00
Andrew Bauer 9c8419f89a detaint to keep perl from complaining 2014-10-10 09:03:30 -05:00
Andrew Bauer 19482851ff New method to determine bitness 2014-10-10 08:10:03 -05:00
Andrew Bauer 4b8aa30a2c Merge branch 'hamiltont-patch-docker' 2014-10-09 15:32:31 -05:00
Andrew Bauer 12412ff5ca Merge branch 'patch-docker' of https://github.com/hamiltont/ZoneMinder into hamiltont-patch-docker
Conflicts:
	Dockerfile
2014-10-09 15:32:09 -05:00
Andrew Bauer a0fccfce01 Merge pull request #492 from SteveGilvarry/434-readthedocs-documentation
Initial attempt to migrate wiki to readthedocs #434
2014-10-09 15:17:20 -05:00
Andrew Bauer 7ea003441d Merge pull request #371 from m-bene/resizeWindows
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
Isaac Connor bc07a43afb Merge pull request #524 from knnniggett/tmpdir
Changes to handling of tmpdir & related variables
2014-10-07 10:05:51 -04:00
Andrew Bauer a359ea7101 fix copy paste typo 2014-10-05 11:40:10 -05:00
Andrew Bauer 1a5844afef auto-recreate missing folders during startup 2014-10-05 11:25:41 -05:00
Andrew Bauer f8cf0401ce fedora specfile changes 2014-10-05 10:27:50 -05:00
Andrew Bauer 48d45c0d00 Add F20 target distro 2014-10-05 10:27:20 -05:00
Andrew Bauer 6aac41b06f Redhat and Fedora distro folder housekeeping 2014-10-05 09:54:29 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Isaac Connor e468896828 Merge pull request #521 from SteveGilvarry/520-Travis-Build-ffmpeg-failure
Fixes 520 travis build ffmpeg failure
2014-10-04 14:35:14 -04:00
SteveGilvarry 2926e9b26c Clone most recent ffmpeg release instead of master 2014-10-04 15:52:11 +10:00
SteveGilvarry d1d952729f Getting Tag to checkout 2014-10-04 15:25:08 +10:00
SteveGilvarry 6175dc040c Testing ffmpeg 2.4 2014-10-04 15:14:12 +10:00
SteveGilvarry 48f34884e7 ffmpeg checkout release 2.4.1 2014-10-03 01:39:17 +10:00
Isaac Connor fa44376291 Todays snapshot 2014-09-26 14:45:23 -04:00
Isaac Connor bec58a6011 fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
Isaac Connor af536624ce add libmime-tools-perl which provides MIME::Entity which is required for email sending 2014-09-26 09:10:26 -04:00
Isaac Connor cacd21ddfd Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-09-18 15:46:00 -04: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
Andrew Bauer aa3803cb0b Update functions.php
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
Andrew Bauer 91b99b97a5 Update functions.php
Add logic to detect the User Agent string from IE11 (and potentially newer).
2014-09-13 08:19:08 -05:00
Andrew Bauer 60ed8d7366 Update ConfigData.pm.in
Changing the help text for DIR_EVENTS, DIR_IMAGES, and DIR_SOUNDS to make it more obvious that one should not specify a folder outside the web root and that one should probably not ever change these values from their default.
2014-09-12 08:05:15 -05:00
Andrew Bauer 887fe24b98 Update zoneminder.service.in 2014-09-11 19:20:09 -05:00
Andrew Bauer cccd1ee14f Update README.CentOS
Change README documentation to recommend disabling selinux
2014-09-11 10:53:11 -05:00
Isaac Connor d1b1c35e48 these fields need to be able to be nul 2014-09-08 17:10:49 -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 b8acac5c32 add polkit stuff required by systemd patch 2014-09-07 17:16:35 -04:00
Isaac Connor e6e3437379 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-09-07 16:15:13 -04:00
Isaac Connor 60d7f8285c requirements to build on debian 2014-09-05 12:23:38 -04:00
Isaac Connor b5c29f30f4 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-09-05 11:48:44 -04:00