Isaac Connor
|
5a3978f9e8
|
Merge pull request #1422 from abishai/master
suppress warnings of killall for FreeBSD
|
2016-04-19 14:40:37 -04:00 |
Isaac Connor
|
ba3f9d1b9a
|
Merge branch 'master' into storageareas
|
2016-04-19 12:03:21 -04:00 |
|
Isaac Connor
|
b2d02a64f4
|
reload stream after error
|
2016-04-19 12:02:58 -04:00 |
|
Isaac Connor
|
7e1a80658b
|
Merge branch 'master' into storageareas
|
2016-04-17 09:30:33 -04:00 |
|
Isaac Connor
|
e255fcc603
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-04-17 09:30:17 -04:00 |
|
Isaac Connor
|
d424a297c4
|
need php5-gd
|
2016-04-17 09:29:55 -04:00 |
|
Isaac Connor
|
bc99e4c476
|
whitespace changes
|
2016-04-17 09:29:14 -04:00 |
|
Isaac Connor
|
98fa65310b
|
whitespace changes
|
2016-04-17 09:29:00 -04:00 |
|
Isaac Connor
|
d6f640907f
|
add avformat_network_init
|
2016-04-17 09:28:43 -04:00 |
root
|
72bf8ac2b8
|
up the debug level for Have Keyframe
|
2016-04-16 15:13:36 -04:00 |
|
root
|
479ea17ed5
|
fix event menubars
|
2016-04-16 15:13:18 -04:00 |
abi
|
7058b0862a
|
suppressed warnings of killall for FreeBSD
|
2016-04-16 16:39:58 +03:00 |
|
Isaac Connor
|
50f2747bb4
|
remove the if(pages>1) so that the if > line always happens
|
2016-04-15 16:11:53 -04:00 |
|
Isaac Connor
|
111b1a1566
|
add back lastKeyframePkt
|
2016-04-15 15:23:22 -04:00 |
|
Isaac Connor
|
db52a61b01
|
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
|
2016-04-15 15:22:58 -04:00 |
|
Isaac Connor
|
f1e69463b6
|
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
|
2016-04-15 15:22:47 -04:00 |
|
Isaac Connor
|
4b4add49bd
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-15 13:18:35 -04:00 |
|
Isaac Connor
|
ccb5ea766d
|
add the toggle for RecordAudio so that the checkbox works to turn off Audio
|
2016-04-15 13:16:52 -04:00 |
|
Isaac Connor
|
3f27f4893c
|
Merge branch 'fix_grant' into storageareas
|
2016-04-15 12:55:13 -04:00 |
|
Isaac Connor
|
b57abb4e54
|
revert
|
2016-04-15 12:50:51 -04:00 |
|
Isaac Connor
|
1e8450ecbf
|
av_set_parameters was deprecated a long time ago
|
2016-04-15 12:50:05 -04:00 |
Steve Gilvarry
|
b343fe2b68
|
Merge pull request #1416 from pliablepixels/runstate-documentation
updated documentation to include runstates
|
2016-04-15 21:48:14 +12:00 |
|
Isaac Connor
|
21b35c4df0
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-14 22:12:52 -04:00 |
|
Isaac Connor
|
b19f990147
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-14 22:12:49 -04:00 |
|
Isaac Connor
|
3e683e3002
|
Add a call to av_set_parameters, found some code that says it must be called
|
2016-04-14 22:12:34 -04:00 |
|
Isaac Connor
|
bcec1813e6
|
More return value checking/commenting
|
2016-04-14 21:54:17 -04:00 |
arjunrc
|
804ac1de81
|
Clone feature added
|
2016-04-14 13:53:10 -04:00 |
|
Isaac Connor
|
c7dceafd67
|
fix first param to zm_dump_stream_format
|
2016-04-14 12:42:47 -04:00 |
|
Isaac Connor
|
30066f788d
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-04-14 12:35:21 -04:00 |
|
Isaac Connor
|
c189e60d9b
|
add some comments, and dump filename and AVFormatContext on failure to write header
|
2016-04-14 12:34:52 -04:00 |
|
Pliable Pixels
|
859a55e1ef
|
updated documentation to include runstates
|
2016-04-13 12:54:22 -04:00 |
|
Isaac Connor
|
6ca40966a1
|
remove teh dropdown-ness of the montage options
|
2016-04-12 08:52:26 -04:00 |
|
Isaac Connor
|
fb48c909ce
|
Merge branch 'log_include_mId' into storageareas
|
2016-04-12 08:42:38 -04:00 |
|
Isaac Connor
|
2724b10163
|
Include mId in syslog logging.
|
2016-04-12 08:42:12 -04:00 |
Andrew Bauer
|
28b30ecb47
|
Merge pull request #1377 from ZoneMinder/random_fixes
Random fixes
|
2016-04-11 12:04:05 -05:00 |
|
Isaac Connor
|
61bd60184a
|
Merge branch 'random_fixes' into storageareas
|
2016-04-11 11:28:24 -04:00 |
|
Isaac Connor
|
7c0f524e1f
|
Merge branch 'master' into random_fixes
|
2016-04-11 11:24:41 -04:00 |
|
Isaac Connor
|
851a81eff7
|
Merge pull request #1406 from ZoneMinder/svg_zones
replace the static zone image with a stream, and use SVG to draw the zones
|
2016-04-11 11:14:11 -04:00 |
|
Isaac Connor
|
6528793ae3
|
Merge branch 'icon_video' into feature-h264-videostorage
|
2016-04-11 10:57:04 -04:00 |
|
Isaac Connor
|
f3673fe4b1
|
Merge branch 'icon_video' into storageareas
|
2016-04-11 10:32:07 -04:00 |
|
Isaac Connor
|
67abf91925
|
add a view to check auth and just send the video
|
2016-04-11 10:31:51 -04:00 |
|
Isaac Connor
|
56c2679afd
|
Merge branch 'icon_video' into storageareas
|
2016-04-11 10:30:01 -04:00 |
|
Isaac Connor
|
32cd5bb88e
|
these have been removed in master
|
2016-04-11 09:33:27 -04:00 |
|
Isaac Connor
|
d493ca69a9
|
Merge branch 'master' into icon_video
|
2016-04-11 09:31:51 -04:00 |
|
Isaac Connor
|
026d3e3189
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-11 09:30:56 -04:00 |
|
Isaac Connor
|
c58b807f8a
|
Merge branch 'feature-h264-videostorage' into icon_video
|
2016-04-11 09:29:03 -04:00 |
|
Isaac Connor
|
32dac7e281
|
Merge pull request #1412 from knnniggett/contentdirs
make cannot write to content dir an error, rather than fatal
|
2016-04-10 21:21:33 -04:00 |
Andrew Bauer
|
5542788a45
|
make cannot write to content dir an error, rather than fatal
|
2016-04-10 18:45:38 -05:00 |
|
Andy Bauer
|
39a30ff51b
|
refresh parent when cancel is clicked
|
2016-04-10 15:59:13 -05:00 |
|
Andy Bauer
|
e5bf2d245c
|
quit the stream in zones.php when zone.php is called
|
2016-04-10 15:33:55 -05:00 |