Isaac Connor
|
94479fc850
|
copy pkt flags as well. When pts is NOPTS_VALUE set it to zero
|
2019-04-03 16:03:21 -04:00 |
|
Isaac Connor
|
055efdc950
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2019-04-03 14:56:18 -04:00 |
|
Isaac Connor
|
bd9b5afe46
|
old ffmpeg doesn't have av_frame_unref and it doesn't seem to be needed
|
2019-04-03 14:56:14 -04:00 |
|
Isaac Connor
|
2e7fd7c9a2
|
handle really old ffmpeg not having pkt_duration
|
2019-04-03 14:55:29 -04:00 |
Isaac Connor
|
b53e4aa803
|
fix segfault
|
2019-04-03 14:51:10 -04:00 |
|
Isaac Connor
|
b6f35db4de
|
put back codec closing in destructure, testing with bionic
|
2019-04-03 14:25:18 -04:00 |
|
Isaac Connor
|
48f7a6f04f
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-03 13:23:14 -04:00 |
|
Isaac Connor
|
aece64049f
|
We cannot avcodec_open2 a context that has been duped. This code currently works without crashes and leaks on ffmpeg 2.8
|
2019-04-03 13:23:00 -04:00 |
|
Isaac Connor
|
f78e95f5d4
|
add is_video_context and is_audio_context and use them in zm_revceive_frame to add audio decoding support
|
2019-04-03 13:21:52 -04:00 |
aktarus82
|
e16f0092cd
|
Merge remote-tracking branch 'upstream/master'
|
2019-04-02 21:43:31 +02:00 |
|
Isaac Connor
|
8f3d1f8653
|
fix a missing = and use csrf_get_tokens instead of csrf_get_secret which is the wrong function
|
2019-04-02 15:25:14 -04:00 |
|
Isaac Connor
|
9e96c29620
|
Log a failed csrf check
|
2019-04-02 15:24:47 -04:00 |
|
Isaac Connor
|
bd412fa9ca
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-02 14:25:50 -04:00 |
|
Isaac Connor
|
036560e3e9
|
Allow packets with pts=AV_NOPTS_VALUE
|
2019-04-02 14:23:49 -04:00 |
|
Isaac Connor
|
cd28559c03
|
when encoding audio, pts and dts have to come from the encoder.
|
2019-04-02 14:08:46 -04:00 |
|
Isaac Connor
|
8a90176a2c
|
Add CanReboot to Controls
|
2019-04-02 09:25:50 -04:00 |
|
Isaac Connor
|
b8120a6d57
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-02 09:06:07 -04:00 |
|
Isaac Connor
|
3ab1c9983a
|
Update Controls INSERTS to match new column count. Add a db update script to update the Controls table with the new CanReboot column
|
2019-04-02 09:05:52 -04:00 |
|
Isaac Connor
|
501324d778
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2019-04-01 22:09:57 -04:00 |
|
Isaac Connor
|
d5402e9cba
|
Correct Storaage Server name in list
|
2019-04-01 22:09:47 -04:00 |
Andrew Bauer
|
2bb15c4f90
|
daemonize zmcontrol (#2563)
|
2019-04-01 17:26:24 -04:00 |
|
Isaac Connor
|
110e5075f4
|
fix namespace fixes #3566
|
2019-04-01 17:21:01 -04:00 |
|
Isaac Connor
|
87cb716500
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-01 14:02:46 -04:00 |
|
Isaac Connor
|
cb33318c4a
|
fix invalid memory access due to incorrect opening/closing/copying of contexts
|
2019-04-01 14:02:39 -04:00 |
|
Isaac Connor
|
a6998cbc9e
|
Use FFMPEGDeInit instead of avformat_network_deinit
|
2019-04-01 13:39:11 -04:00 |
|
Isaac Connor
|
c9985107ee
|
Add a deinit function to handle avformat_network_deinit
|
2019-04-01 13:38:13 -04:00 |
|
Isaac Connor
|
15fb546e15
|
spacing
|
2019-04-01 11:13:35 -04:00 |
|
Isaac Connor
|
ed5a448a1d
|
Correct pts on audio frame before sending it to the encoder so that when we flush the encoder the resulting packets have the right pts.
|
2019-04-01 11:13:14 -04:00 |
|
Isaac Connor
|
7d07cdf530
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-01 10:12:09 -04:00 |
|
Isaac Connor
|
fa9803d819
|
Can't use this->data to avoid another db hit. Must load by id
|
2019-04-01 10:11:56 -04:00 |
Andrew Bauer
|
fc38e5f48b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-03-30 10:41:36 -05:00 |
|
Andrew Bauer
|
e97751558f
|
eslint fix
|
2019-03-30 10:41:04 -05:00 |
|
Andrew Bauer
|
593f1571e3
|
add zmrecover.pl to rpm specfile
|
2019-03-30 08:57:04 -05:00 |
|
Andrew Bauer
|
1d3617c1cf
|
Rem reference to AUTHORS since it no longer exists
|
2019-03-30 08:43:46 -05:00 |
|
Andrew Bauer
|
4e5ed68232
|
update redhat install guide
|
2019-03-30 08:36:45 -05:00 |
|
Andrew Bauer
|
e3caf38a72
|
Update zoneminder.spec
|
2019-03-30 08:20:18 -05:00 |
|
Andrew Bauer
|
8556e13504
|
Update zoneminder.spec
|
2019-03-30 08:16:46 -05:00 |
|
Isaac Connor
|
d579faa291
|
attr in modern ZM should be StartWeekday. Continue to support legacy filters
|
2019-03-28 15:13:53 -04:00 |
|
Isaac Connor
|
90e97ff135
|
Merge branch 'master' into storageareas
|
2019-03-28 11:20:29 -04:00 |
|
Isaac Connor
|
95657491e0
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-03-28 09:43:39 -04:00 |
|
Isaac Connor
|
49e3f0a68e
|
eslint fixes
|
2019-03-28 09:43:31 -04:00 |
|
Isaac Connor
|
9a70dff143
|
to single quotes, include monitor Id when logging the closing of an event
|
2019-03-28 09:43:17 -04:00 |
|
Isaac Connor
|
e6547953b0
|
fix segfault using old ffmpeg
|
2019-03-28 09:24:32 -04:00 |
|
Isaac Connor
|
ee4b452e42
|
Update monitor edit to not use inline js
|
2019-03-25 16:25:09 -04:00 |
|
Isaac Connor
|
c7e09e03d3
|
add cache busting to base.js
|
2019-03-25 16:24:46 -04:00 |
|
Isaac Connor
|
ba8c96e113
|
Merge branch 'master' into storageareas
|
2019-03-25 12:33:33 -04:00 |
|
Isaac Connor
|
acb9070b04
|
Add a warning when an event exceeds section length
|
2019-03-25 12:33:30 -04:00 |
|
Isaac Connor
|
052a2ef1fd
|
fix eventserver => eventnotification
|
2019-03-25 12:20:21 -04:00 |
|
Isaac Connor
|
7565e171b4
|
spacing
|
2019-03-25 12:18:15 -04:00 |
|
Isaac Connor
|
4eafc52955
|
spacing
|
2019-03-25 12:18:01 -04:00 |