Isaac Connor
|
7575afc8d5
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:38:32 -04:00 |
|
Isaac Connor
|
4ff341a0f5
|
Merge branch 'master' into zma_to_thread
|
2020-05-02 18:03:42 -04:00 |
|
Isaac Connor
|
434f34f027
|
use delete[] instead of delete.
|
2020-04-30 11:04:55 -04:00 |
|
Isaac Connor
|
ae9a5766f5
|
Merge branch 'release-1.34' into fix_zms
|
2020-04-26 18:19:30 -04:00 |
|
Isaac Connor
|
1c197db619
|
Merge branch 'master' into rate_dropdown
|
2020-01-07 14:49:58 -05:00 |
|
Isaac Connor
|
16a73d6d5a
|
don't seek back when not neccesary
|
2019-12-13 18:12:33 -05:00 |
|
Isaac Connor
|
5fcd6361bc
|
fix segfault reading frames for .mp4 in zms
|
2019-12-13 17:47:18 -05:00 |
|
Isaac Connor
|
3b9b49c44d
|
wip work on fixing zms mp4 to mjpeg
|
2019-12-02 15:51:03 -05:00 |
|
Isaac Connor
|
09fcbad666
|
Merge branch 'master' into zma_to_thread
|
2019-11-30 14:59:39 -05: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
|
396be10d6f
|
Merge branch 'master' into zma_to_thread
|
2019-08-22 12:57:00 -04:00 |
|
Isaac Connor
|
05be9008c7
|
use FFMPEGInit to initialise ffmpeg instead of doing it ourselves
|
2019-07-11 17:57:11 -04:00 |
|
Isaac Connor
|
d0abd16494
|
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
|
2019-06-25 15:34:01 -04:00 |
|
Isaac Connor
|
2cbcaeebbc
|
clean out old hwdecode stuff. refactor common code out
|
2019-06-25 14:11:59 -04:00 |
|
Isaac Connor
|
077ad75516
|
Merge branch 'storageareas' into origin/zma_to_thread
|
2019-04-25 12:41:48 -04:00 |
Isaac Connor
|
a30c4d9551
|
rework ffmpeg_input to not use pkt_duration which doesn't exist in avconv
|
2019-03-21 10:41:59 -04:00 |
|
Isaac Connor
|
9b713a489d
|
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
handle infinite fps
|
2019-03-06 14:50:36 -05:00 |
|
Isaac Connor
|
b16cd7ec84
|
Merge branch 'h265' into zma_to_thread
|
2018-11-20 12:38:17 -05:00 |
|
Isaac Connor
|
b291c06035
|
Working zms h265 playing.
|
2018-11-19 16:45:56 -05:00 |
|
Isaac Connor
|
0ec391354c
|
Merge branch 'fix_zms_from_mp4' into h265
|
2018-09-13 16:18:28 -04:00 |
|
Isaac Connor
|
0efc45fa93
|
implement a getFrame function that takes a timestamp and will seek to the appropriate time in the mp4 before getting a frame
|
2018-09-11 13:21:12 -04:00 |
|
Isaac Connor
|
c7deb91319
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2018-04-14 14:58:25 -04:00 |
|
Isaac Connor
|
cd3046abb3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-04-14 11:03:08 -04:00 |
|
Isaac Connor
|
646f0dd65e
|
fix merge
|
2018-03-03 13:31:55 -08:00 |
|
Isaac Connor
|
03d3f5e665
|
Merge branch 'storageareas' into zma_to_thread
|
2018-03-03 13:28:01 -08:00 |
Isaac Connor
|
d980def64f
|
spacing, increase debug
|
2018-03-02 18:26:07 -08:00 |
|
Isaac Connor
|
43b71fc49b
|
rework
|
2017-11-20 15:32:40 -05:00 |
|
Isaac Connor
|
74650ebc70
|
simplify Analysis
|
2017-11-20 11:48:56 -05:00 |
|
Isaac Connor
|
64816aa005
|
fixes from cppcheck.
|
2017-11-18 16:00:10 -05:00 |
|
Isaac Connor
|
3be40bcc99
|
blah
|
2017-10-25 13:25:44 -07:00 |
|
Isaac Connor
|
2a4f751a4f
|
ffmpeg versionc heck
|
2017-08-24 12:00:48 -04:00 |
Isaac Connor
|
789de37d33
|
fix builds on older ffmpeg
|
2017-08-24 09:53:40 -04:00 |
|
Isaac Connor
|
a81ff85fbb
|
add ffmpeg decoding of a .mp4 to get the frames
|
2017-08-23 15:05:44 -04:00 |
|
Isaac Connor
|
62d6394923
|
finish roughing in ffmpeg_input
|
2017-06-26 16:55:49 -04:00 |
|
Isaac Connor
|
b73c0ba978
|
rough in zm_ffmpeg_input and split out eventstream
|
2017-06-22 17:58:32 -04:00 |