Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
824d7c5b43
|
Merge ../ZoneMinder.Steve into packetqueue
|
2016-08-31 11:58:22 -04:00 |
|
Isaac Connor
|
55c6e5a6db
|
cleanup putting packetqueue in the monitor. It should be in the camera
|
2016-08-31 11:47:42 -04:00 |
|
Isaac Connor
|
6a8db582ff
|
whitespacing updates
|
2016-06-21 12:21:18 -04:00 |
Steve Gilvarry
|
0abfb7378a
|
Buffer work
|
2016-05-18 00:01:33 +10:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
03b1ced568
|
tabs to spaces and use 2space indenting
|
2016-04-04 10:11:48 -04:00 |
|
Isaac Connor
|
c26dbb9028
|
rough in record_audio, and do lots of whitespace cleanups
|
2016-03-31 12:54:56 -04:00 |
SteveGilvarry
|
0e4156c095
|
Add CaptureAndRecord to vlc, still need to make it record
|
2014-10-23 19:56:35 +11: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
|
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 |
|
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 |
Edward Barnard
|
6c94308ba0
|
Fix bug in frame difference checker.
|
2013-12-22 01:06:12 +00:00 |
|
Edward Barnard
|
3e2647782d
|
Better error handling
|
2013-12-19 23:10:45 +00:00 |
|
Edward Barnard
|
f4d72752a8
|
Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates
|
2013-12-19 23:02:21 +00:00 |
|
Edward Barnard
|
e4a16ee57c
|
All colourspaces now working
|
2013-12-19 21:51:39 +00:00 |
|
Edward Barnard
|
c25011e781
|
Fix seemingly random lockup.
|
2013-12-19 21:51:39 +00:00 |
|
Edward Barnard
|
3321506b45
|
Working libvlc camera implementation.
|
2013-12-19 21:51:39 +00:00 |