Isaac Connor
|
fab548b119
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-08 16:46:28 -04:00 |
Isaac Connor
|
1b98f3529f
|
allow non-increasing dts in muxer
|
2019-04-08 14:18:59 -04:00 |
|
Isaac Connor
|
7f2440177b
|
remove duplicate dump_codec
|
2019-04-08 13:51:55 -04:00 |
|
Isaac Connor
|
accaeadb18
|
code cleanup. dump_codecs
|
2019-04-08 13:51:41 -04:00 |
|
Isaac Connor
|
e81c216b4a
|
add more fields in dump_codec.
|
2019-04-08 13:51:13 -04:00 |
|
Isaac Connor
|
2f2e798696
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-04-08 10:12:53 -04:00 |
|
Isaac Connor
|
806400bd81
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-08 10:04:38 -04:00 |
|
Isaac Connor
|
3c57d79669
|
Go back to using video_first_dts
|
2019-04-08 10:04:26 -04:00 |
|
Isaac Connor
|
64ec568547
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-04-08 09:57:13 -04:00 |
Andrew Bauer
|
4b2fe5c3c7
|
Update zoneminder.spec
|
2019-04-07 18:21:52 -05:00 |
|
Isaac Connor
|
d776f63bd8
|
Change MonitorIds from TinyText to TEXT. Fixes #2569
|
2019-04-07 17:23:39 -04:00 |
|
Isaac Connor
|
f719dd9acc
|
always commit buffered db_frames when we have a new max score image or alarm cause image
|
2019-04-07 10:29:02 -04:00 |
|
Isaac Connor
|
780f4f9b9a
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-04-06 09:27:44 -04:00 |
|
Isaac Connor
|
9faaba9300
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-05 15:18:39 -04:00 |
|
Isaac Connor
|
381f526d66
|
spacing
|
2019-04-05 15:18:20 -04:00 |
|
Isaac Connor
|
aa83239069
|
rework zmcontrol.pl. If command is given and server is not up, use zmdc.pl to start it. Give up after 10 seconds.
|
2019-04-05 15:18:03 -04:00 |
|
Isaac Connor
|
e1873b1693
|
debug response content
|
2019-04-05 15:17:13 -04:00 |
|
Isaac Connor
|
aaef151815
|
ZM_VERSION is a constant not a scalar variable
|
2019-04-05 13:18:06 -04:00 |
|
Isaac Connor
|
9ae6acf532
|
Fix for opening audio_in_codec
|
2019-04-04 17:20:21 -04:00 |
|
Isaac Connor
|
d97dd6cdd9
|
Should close videostore before closing input codecs/streams.
|
2019-04-04 14:11:56 -04:00 |
|
Isaac Connor
|
7955a1c9b2
|
fix version check to get rid of deprecated av_register_all
|
2019-04-04 12:56:00 -04:00 |
|
Isaac Connor
|
bc62493096
|
Increase sql buffer space because we are using path strings that are PATH_MAX size.
|
2019-04-04 12:55:35 -04:00 |
|
Isaac Connor
|
f6d5038586
|
we only use event_file if we are writing out a jpg, so only generate the event_file string if we are writing out jpgs
|
2019-04-04 12:37:25 -04:00 |
|
Isaac Connor
|
271937f005
|
store the snapshot_file and alarm_file strings in the boject during construction so that we don't have to do it everytime we write out an image
|
2019-04-04 12:28:08 -04:00 |
|
Isaac Connor
|
8704393b55
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-04 12:18:57 -04:00 |
|
Isaac Connor
|
79de2b65cd
|
If we are saving jpegs we don't save a snapshot image, and since we may delay writing frame info to the db, we have to default to frame 0 instead of snapshot
|
2019-04-04 12:18:46 -04:00 |
|
Isaac Connor
|
f3d0c4e643
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-04-04 09:37:13 -04:00 |
|
Isaac Connor
|
8de7d576a5
|
spacing and use Error instead of fprintf(stderr) so that things get logged.
|
2019-04-04 09:35:37 -04:00 |
|
Isaac Connor
|
8d3fa807e2
|
compilation fixes for old ffmpeg
|
2019-04-03 16:51:41 -04:00 |
|
Isaac Connor
|
12631abd46
|
when copying a packet (for old ffmpeg) copy pts, dts and duration too
|
2019-04-03 16:51:27 -04:00 |
|
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 |