ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,643 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7643 Commits

Author SHA1 Message Date
Isaac Connor a6b23f50d5 Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 10:21:14 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 59b28e8346 deprecate the z_frame_rate stuff which is deprecated in ffmpeg 2016-09-13 10:15:47 -04:00
Isaac Connor 3dfe1185ff add ffmpeg as option to libav-tols 2016-09-13 10:11:50 -04:00
Isaac Connor a80881bb98 Merge branch 'fix_1620' into storageareas 2016-09-13 10:03:02 -04:00
Isaac Connor 88d86afd85 Merge ../ZoneMinder.master into storageareas 2016-09-13 10:02:53 -04:00
Isaac Connor 2bc5742aec Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 09:53:39 -04:00
Isaac Connor 39e06b929f add braces and only call closeEvent if there is an event 2016-09-13 09:36:45 -04:00
Isaac Connor 44591432dd Merge pull request #1622 from SteveGilvarry/zmu_record 
Fix for ZMU killing recording
 2016-09-13 09:30:38 -04:00
Steve Gilvarry fc060135fe Move our recording flag deeper into closeevent 2016-09-13 22:58:38 +10:00
Isaac Connor 54db9f2e3a ptzControl expects a monitor object instead of a dbrow array. 2016-09-12 21:36:03 -04:00
Isaac Connor d0fb2acfaa rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments 2016-09-12 21:35:14 -04:00
Isaac Connor 6366d137bc add more debug code 2016-09-12 21:34:18 -04:00
Steve Gilvarry 54375d7653 Merge pull request #1587 from knnniggett/travis-zmonvif-off 
don't build the onvif libraries in travis
 2016-09-11 14:14:33 +10:00
Steve Gilvarry 563f4a9d46 Merge pull request #1505 from ZoneMinder/fix_filter_actions 
Confirmed check box status is now retained after save and changing filters.
 2016-09-11 14:13:51 +10:00
Isaac Connor 4ee1f38dd0 move storing packet to videostore up before decoding. move packet allocation inside the while that it needs to be in. 2016-09-09 14:38:16 -04:00
Isaac Connor 15569d4f33 whitespace, commenting, cleanup some Type castings, init zones[i] to null, because it might not get assigned a Zone object. 2016-09-09 10:07:13 -04:00
Isaac Connor 4cfd5cfbb9 deprecate safepkt, not sure why it was needed 2016-09-09 10:05:54 -04:00
Isaac Connor caaaffbb5d change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:29 -04:00
Isaac Connor c6607ea5fe change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:24 -04:00
Isaac Connor 5e7404d448 define zm_av_unref_packet 2016-09-09 10:04:54 -04:00
Isaac Connor 8148e35ec6 rework to dynamically allocate packet instead of putting it on the stack. Plus packet freeing cleanups 2016-09-09 10:04:42 -04:00
Andrew Bauer e35ef3ce83 Merge pull request #1617 from coracis/master 
Update German translation
 2016-09-09 08:55:19 -05:00
Andrew Bauer 321deb5506 Merge pull request #1599 from sabbath88/master 
add some more translation
 2016-09-09 08:40:05 -05:00
Isaac Connor 3a06ba7a65 Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later. 2016-09-09 09:15:04 -04:00
corax 070051d06a Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9' 
For easy pull-requesting
 2016-09-09 14:20:03 +02:00
corax 6fab2e97b1 Update German translation of Buffer 2016-09-09 13:32:20 +02:00
corax b10c79b4f7 Add translation for 'Montage Review' 2016-09-09 13:26:19 +02:00
corax 6b18184e4a Remove confusing link to web console 2016-09-09 12:38:30 +02:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
corax 430ecd8e32 Fix some too direct translations into German 2016-09-09 11:51:53 +02:00
corax d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Isaac Connor 5fb1c45c4e Merge ../ZoneMinder.connortechnology into storageareas 2016-09-08 11:34:36 -04:00
Isaac Connor 7b0a14ee72 change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir. 2016-09-08 11:06:02 -04:00
Isaac Connor 6e9cb06290 Merge branch 'storageareas' into packetqueue 2016-09-08 09:40:52 -04:00
Isaac Connor f67a58723c Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:40:05 -04:00
Steve Gilvarry 34a85ba3f1 Moron forgot a file 2016-09-08 23:39:04 +10:00
Isaac Connor 7a62d84bd2 Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:23:31 -04:00
Isaac Connor 3c228e6c16 Merge pull request #1614 from pliablepixels/1537-zone-controller-bug 
1537 zone controller bug
 2016-09-07 12:52:09 -04:00
Steve Gilvarry 33baa3b302 Free Audio and pickup unconverted video codec context. 2016-09-06 23:25:59 +10:00
Steve Gilvarry e40acc301d Add mAudioCodecContext and mAudioCodec and turn existing into video 
versions. Check if audio stream available and check audio stream codec
same as video is being checked now. Was Seg faulting if no audio stream.
 2016-09-06 01:27:57 +10:00
Pliable Pixels 1440dd9265 retab 2016-09-03 15:02:32 -04:00
Pliable Pixels 7bf0b3c423 readded forMonitor - removed by mistake 2016-09-03 14:51:24 -04:00
Pliable Pixels 9a4330eb59 #1537 Zones Controller not returning all zones 2016-09-03 14:46:47 -04:00
Kyle Johnson d6852e10b7 Merge pull request #1609 from connortechnology/fix_1606 
implement suggested code to stop the monitor when Function is set to …
 2016-09-01 22:57:57 -06:00
Isaac Connor dfb06fd548 Merge pull request #1607 from mattdurant/fix_issue_1460 
Fix issue #1460
 2016-09-01 14:02:13 -04:00
Isaac Connor 21431a5733 Merge pull request #1608 from mattdurant/issue_1590 
Added check for SINGLE_IMAGE to ignore socket closed by remote side
 2016-09-01 12:30:47 -04:00
Isaac Connor e0472cf820 Merge pull request #1602 from mdrush/1601-fix-ssmtp-messages 
added missing ssmtp support in sendMessage
 2016-09-01 11:49:42 -04:00
Isaac Connor 55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
Isaac Connor 81e9d31a95 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-01 10:53:35 -04:00