a4cf47b5c3
move swscale into it's own files
2017-08-23 15:06:12 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
732ebf6df4
shorted some variable names and correct spacing
2017-08-23 10:37:32 -04:00
3033d2f2ce
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-23 10:14:38 -04:00
eb5cee7f3e
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
2017-08-23 10:14:06 -04:00
4d692d0752
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-23 09:54:17 -04:00
a8cf384be9
rpm spcfile change
...
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
e98ea0b891
fix non hwaccel build
2017-08-22 10:47:37 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
d406d9549c
use int instead of unsigned int. Google code style says it's right, and it gets rid of a comparison warning
2017-08-22 09:47:30 -04:00
9a6bfb2d02
fix some quotes, double to single
2017-08-22 09:44:45 -04:00
40cc13a903
fix whitespace
2017-08-22 09:34:02 -04:00
9b95259567
fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id
2017-08-22 09:33:51 -04:00
160641563f
packpack - add missing $parms var
2017-08-21 18:50:30 -05:00
52603b24c0
Update .travis.yml
...
Add 32bit centos builds using my docker repo
2017-08-21 13:35:57 -05:00
613bbfb65b
arm neon-check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect ( #1966 )
...
* arm neon - check "uname -m" if CMAKE_SYSTEM_PROCESSOR is not what we expect
* skip arm neon check it not on linux
2017-08-21 12:02:28 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
431ec3ea75
Update faq.rst ( #1970 )
...
The memory math is confusing and incorrect. Original posted added a 5th camera but did not update the final memory size or explain how they arrived at that value.
2017-08-21 11:25:44 -04:00
a534a9e5a9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-21 11:03:47 -04:00
cf8560b648
fix duration if it's negative
2017-08-21 10:15:56 -04:00
5030254ba0
build f26 packages with my docker repo
...
The packpack project does not provide a fedora 26 docker image so I made my own.
2017-08-20 20:12:18 -05:00
dc1aa2b670
Update redhat.rst
2017-08-19 21:41:19 -05:00
7d0531ccdd
Update packpack.rst
2017-08-19 21:37:04 -05:00
e749866101
Update packpack.rst
2017-08-19 21:17:06 -05:00
20b0a26bc5
Update startpackpack.sh
2017-08-19 20:59:30 -05:00
ccb7e08aae
remove extra whitespace
2017-08-19 20:58:26 -05:00
25c19198f6
packpack - relax the requirements for repoquery
2017-08-19 20:57:41 -05:00
7ceb88866c
packpack - put pack redhat specific packpack parms
2017-08-19 17:47:06 -05:00
4e61f2f55a
packpack - don't filter output when we aren't in travis
2017-08-19 17:17:18 -05:00
a191486c18
packpack - update rpm fusion download url
2017-08-19 16:56:17 -05:00
54f780e2d3
Update redhat.rst
2017-08-19 13:15:11 -05:00
4ccca556e1
Update packpack.rst
2017-08-19 12:52:21 -05:00
52accd7ff5
Update packpack.rst
2017-08-19 12:50:07 -05:00
9172a1bc42
Update packpack.rst
2017-08-19 12:48:57 -05:00
e473806fff
Update packpack.rst
2017-08-19 12:47:41 -05:00
8bf395465f
Update packpack.rst
2017-08-19 12:46:38 -05:00
65f03ce613
Update packpack.rst
2017-08-19 12:46:00 -05:00
7ed53f766e
Update packpack.rst
2017-08-19 12:45:39 -05:00
7a1208daaa
Update packpack.rst
2017-08-19 12:43:28 -05:00
4adad745d0
Update packpack.rst
...
fix bullets
2017-08-19 12:42:44 -05:00
dafe125ed5
initial commit to add packpack build instructions
2017-08-19 12:39:54 -05:00
76b9a9dc01
build non-el6 rpms from rpm fusion rather than zmrepo
2017-08-19 09:07:32 -05:00
6e24eb6462
use find_one ins tead of New when loading event to determine if event still exists in db
2017-08-18 09:28:14 -04:00
f01adc6be5
fixes
2017-08-17 10:18:51 -04:00
05b9b8bc51
Update .travis.yml
...
remove nightly build support for fedora 24
2017-08-16 18:53:02 -05:00
d71b30aff3
Images Gif to PNG ( #1969 )
...
* Images Gif to PNG
Extension change to PNG
* Images Gif to PNG
Extension change to PNG
* Images Gif to PNG
Extension change to PNG
2017-08-16 14:51:20 -04:00
b9fdeb2272
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-16 13:41:57 -04:00
a63d0878b6
remove more hwaccel code
2017-08-16 13:41:44 -04:00
fbe5385e06
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-16 12:41:23 -04:00
Isaac Connor
Andrew Bauer
jethornton
Isaac Connor
Andy Bauer
peruchi