Isaac Connor
|
1653270afd
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-13 16:06:47 -04:00 |
Isaac Connor
|
eafa0da06f
|
fixes, handle when audio codec isn't open in ffmpeg_camera
|
2019-09-13 16:06:25 -04:00 |
|
Isaac Connor
|
3a5d1ff3ca
|
Hack in missing bits for ubuntu trusty/libav/avresample
|
2019-09-13 15:51:35 -04:00 |
|
Isaac Connor
|
e71817c32e
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-13 14:35:11 -04:00 |
|
Isaac Connor
|
5ddd20ed1a
|
refactor code. Handle resample buffering during encoding instead of when closing file
|
2019-09-13 14:34:53 -04:00 |
|
Isaac Connor
|
701aa8d924
|
add flushing the resample buffer to get the remaining samples encoded
|
2019-09-13 10:55:30 -04:00 |
|
Isaac Connor
|
16a7ab1392
|
Attempt to deploy any deb basesd distro, not just trusty
|
2019-09-13 08:21:19 -04:00 |
|
Isaac Connor
|
788b5b480b
|
hack to make sync work on resample
|
2019-09-12 17:59:08 -04:00 |
|
Isaac Connor
|
d9d4c6b4ca
|
fix build
|
2019-09-12 17:26:19 -04:00 |
|
Isaac Connor
|
332fd80cf8
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-12 16:53:16 -04:00 |
|
Isaac Connor
|
0a8aba2b76
|
rework how pts/dts is handled. We still use video_first_pts, but if the result is negative, normalize it to 0. Also now use audio_next_pts/dts to calculate pts when resampling and re-encoding. I believe this resolves the issues with wrong duration in the audio stream.
|
2019-09-12 16:52:59 -04:00 |
|
Isaac Connor
|
8fb55cdbff
|
Add codec name to zm_dump_codec and zm_dump_codecpar add new functions zm_receive_packet
|
2019-09-12 16:51:33 -04:00 |
|
Isaac Connor
|
94f2dccae5
|
Merge pull request #2704 from connortechnology/fix_2702
general clean of onvif probe view. Use buttons instead of inputs and…
|
2019-09-11 09:18:27 -04:00 |
|
Isaac Connor
|
d141632256
|
general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui.
|
2019-09-11 09:18:03 -04:00 |
|
Isaac Connor
|
4891306cdf
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-10 17:20:43 -04:00 |
|
Isaac Connor
|
772e25e61b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-10 17:20:29 -04:00 |
|
Isaac Connor
|
30687de918
|
Handle 0 value for StorageId
|
2019-09-10 17:20:18 -04:00 |
|
Isaac Connor
|
501b3a52fb
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-09 17:11:25 -04:00 |
|
Isaac Connor
|
6c6b2d7c6f
|
Fix build
|
2019-09-09 17:10:40 -04:00 |
|
Isaac Connor
|
02eb222f17
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-09 17:09:26 -04:00 |
|
Isaac Connor
|
097ce5e778
|
add const to cast
|
2019-09-09 17:09:01 -04:00 |
|
Isaac Connor
|
99df250f1b
|
Merge branch 'master' of github.com:connortechnology/ZoneMinder
|
2019-09-09 17:07:31 -04:00 |
|
Isaac Connor
|
2bffc17594
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-09 16:55:34 -04:00 |
|
Isaac Connor
|
792af28c54
|
return a value from write_packet
|
2019-09-09 16:55:22 -04:00 |
|
Isaac Connor
|
9682edd080
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-09 16:16:49 -04:00 |
Isaac Connor
|
d5aa95e45f
|
cpplint fixes
|
2019-09-09 16:13:32 -04:00 |
|
Isaac Connor
|
922273410b
|
correct dist for debian
|
2019-09-09 10:04:57 -04:00 |
|
Isaac Connor
|
8103156436
|
when deleting multiple events, each event has to be it's own transaction due to locking
|
2019-09-09 09:16:52 -04:00 |
|
Isaac Connor
|
f1cffa6fe1
|
Add more debian based distros to packpack builds
|
2019-09-09 08:22:58 -04:00 |
|
Isaac Connor
|
52aa0f9e5d
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-08 16:11:30 -04:00 |
|
Isaac Connor
|
d5d4d9d19b
|
ret should be a heap var, not a member of the object. Somehow this also seems to fix crashing on debian buster. I assume the compiler is confused
|
2019-09-08 16:10:57 -04:00 |
|
Isaac Connor
|
8215fe1c0f
|
Some versions off avcodec libs have pkt_pts and pkt_dts but they have been deprecated and weren't of any use anyways
|
2019-09-08 16:10:20 -04:00 |
|
Isaac Connor
|
e6351109b2
|
Now that we are using our fork of packpack, no longer need to patch it
|
2019-09-06 12:00:50 -04:00 |
|
Isaac Connor
|
c58cb38233
|
Add some debug echos, fix zmfilter command line and remove -1 from changelog version, as packpack version wont' have it.
|
2019-09-06 11:25:21 -04:00 |
|
Isaac Connor
|
6bd2267483
|
Fix installing default filters failing due to missing values for AutoCopy and AutoCopyTo
|
2019-09-06 10:55:34 -04:00 |
|
Isaac Connor
|
4634cb63e5
|
Use ZoneMinder's fork of packpack. Use isaac@zoneminder.com instead of personal email. set DISTRO in changelog
|
2019-09-06 09:31:08 -04:00 |
|
Isaac Connor
|
bce1a48b66
|
Fix another Monitorid. Fixes #2699
|
2019-09-05 10:31:22 -04:00 |
|
Isaac Connor
|
6f59d63e08
|
Add missing AutoCopy and AutoCopyTo in db creation
|
2019-09-05 09:55:58 -04:00 |
|
Isaac Connor
|
25198e0eb0
|
move session_close to after auth so that whatever we do with the session in auth gets saved
|
2019-09-04 17:53:59 -04:00 |
|
Isaac Connor
|
eea1732675
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-04 13:39:21 -04:00 |
|
Isaac Connor
|
6b83a62fad
|
allow for StorageId to be 0
|
2019-09-04 13:35:46 -04:00 |
|
Isaac Connor
|
3bafbf69be
|
Merge pull request #2698 from connortechnology/fix_auth_persistence_by_regenerating_cookie
Fix auth timing out due to cookie timing out and getting deleted.
|
2019-09-04 12:20:47 -04:00 |
|
Isaac Connor
|
2993e52652
|
Fix auth timing out due to cookie timing out and getting deleted.
|
2019-09-04 12:14:32 -04:00 |
|
Isaac Connor
|
f568e0da30
|
Fix event->id() to event->Id()
|
2019-09-04 10:11:16 -04:00 |
|
Isaac Connor
|
a57c5196f3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-04 10:07:31 -04:00 |
|
Isaac Connor
|
dde655950f
|
Use locking when deleting an event
|
2019-09-04 10:07:17 -04:00 |
|
Isaac Connor
|
26670c2df2
|
Add lock function to write lock an object
|
2019-09-04 10:07:08 -04:00 |
|
Isaac Connor
|
f390a0ca03
|
Merge pull request #2697 from ZoneMinder/cake-debug-off
In production mode, debug should be 0
|
2019-09-04 09:59:39 -04:00 |
Pliable Pixels
|
be99f6a4d6
|
In production mode, debug should be 0
|
2019-09-04 08:47:09 -04:00 |
|
Isaac Connor
|
2f7596f179
|
Merge pull request #2696 from connortechnology/freebsd_arm
fixes #2694
|
2019-09-03 13:33:26 -04:00 |