9ea24a6e04
Merge pull request #539 from SteveGilvarry/test-ffmpeg-2.4.2
...
Update Travis to ffmpeg 2.4.2
2014-10-23 07:00:23 -05:00
838eb64537
Update Travis to ffmpeg 2.4.2
2014-10-23 20:22:09 +11:00
2f32c3895b
Merge branch 'release-1.28'
...
Conflicts:
web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
c9c6c17699
add script for TVIP862IC. Should also work with IP672 and others.
2014-10-22 15:08:58 -04:00
c5a1d9ffa9
fix console refresh in this skin too
2014-10-22 10:58:06 -04:00
c8a985a65f
Merge branch 'release-1.28'
2014-10-22 10:31:57 -04:00
85529efffc
check for existence of the columns beefore trying to add them
2014-10-22 10:31:23 -04:00
23ebbf3887
Update skin.js
...
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-21 17:22:33 -05:00
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
2014-10-21 15:17:34 -04:00
07cddf4164
Merge branch 'master' into release-1.28
2014-10-21 09:48:05 -04:00
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
cbfe7a3e9e
Update version
...
What is this file used for?
2014-10-21 07:21:13 -05:00
607ce08613
Update version
...
What is this file used for?
2014-10-21 07:20:53 -05:00
5dedbc2135
detect when the control address has a http in front, and do the right thing
2014-10-20 16:55:24 -04:00
9ce7da4147
Don't 'use Data::Dumper'; it was only there for debug
2014-10-20 16:47:03 -04:00
693c4b2e68
Merge branch 'release-1.28'
2014-10-20 16:45:59 -04:00
c4394c3c92
add liburi-encode-perl to dependencies, we use it in M8640, will likely use it elsewhere
2014-10-20 16:45:15 -04:00
38ec44f04e
Merge branch 'release-1.28'
2014-10-20 15:33:06 -04:00
896ae6250a
Merge branch 'release-1.28' of github.com:ZoneMinder/ZoneMinder into release-1.28
2014-10-20 15:32:42 -04:00
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
6a1db0f895
Use libvlccore5 instead of 7 or 8
2014-10-19 10:11:17 -05:00
bdef494ac3
Use libvlccore7 instead of 8
2014-10-19 10:07:34 -05:00
7bb8422b00
Add libvlc to Travis
2014-10-19 09:49:49 -05:00
408bbbd535
Merge branch 'release-1.28'
2014-10-19 07:44:27 -05:00
fcf39fc9fa
Update zoneminder.cmake.f20.spec
...
Fix path to README file
2014-10-18 17:36:12 -05:00
71b56a163d
Zoneminder 1.28.0 Release
2014-10-18 15:23:13 -05:00
4fd2230b1d
add release 1.28.0
2014-10-17 09:27:54 -04:00
61ebb56424
add 1.28.0 release
2014-10-17 09:26:59 -04:00
a043526994
Merge pull request #462 from knnniggett/memory
...
Fix for shared data size conflict
2014-10-17 09:18:21 -04:00
8a33f78243
bugfix; coredump if no codec name was specified in url.
2014-10-15 14:35:01 -04:00
638ef29e28
Merge branch 'libav_ffmpeg_fixes'
2014-10-15 13:25:06 -04:00
2a71973307
make zm compile using libav on ubunut 14.04
2014-10-15 13:23:29 -04:00
58b826b0a2
more url documentation
2014-10-15 13:14:56 -04:00
525d4110da
bump snapshot #
2014-10-15 13:14:36 -04:00
348538b778
distros/ubuntu1204/changelog
2014-10-15 13:14:19 -04:00
9eb88d3f15
add a check for db connection to handle the db going away and coming back
2014-10-15 09:43:00 -04:00
7dbad45e30
Update README.Fedora
2014-10-12 15:54:54 -05: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
810cf1aed3
Merge pull request #530 from knnniggett/ffmpeg
...
fixes ftbs with no ffmpeg support
2014-10-11 17:29:05 -05:00
9ef9b17c6b
fixes ftbs with no ffmpeg support
2014-10-11 17:14:09 -05:00
f4b248a711
Merge branch 'Sune1337-zms/videostream-improvements'
2014-10-11 15:39:07 -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
Andrew Bauer
SteveGilvarry
Isaac Connor
Andrew Bauer
Isaac Connor
Sune1337
Sune1337