Kfir Itzhak
c5c9b52d18
Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale
2017-03-19 13:02:42 +02:00
Andrew Bauer
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
Andrew Bauer
d38bae72ae
integrate csrf-magic library
2017-03-18 20:12:06 -05:00
Kfir Itzhak
e02e033cc8
Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection
2017-03-19 02:05:01 +02:00
SteveGilvarry
e5b18ee213
Remove zmc -r argument as it does not seem to be implemented.
2017-03-18 23:25:14 +11:00
Steve Gilvarry
3a69238381
Fix failure to attribute previous work
...
Just fixing this up as there is a issue logged from Debian for it.
2017-03-18 23:05:32 +11:00
SteveGilvarry
a16ea554a3
Swap to PNG
2017-03-18 22:34:13 +11:00
Matthew Noorenberghe
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
Matthew Noorenberghe
91ad6afffb
Increase default window sizes for the flat theme. Fixes #1059
...
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
Matthew Noorenberghe
ea5342abd2
Properly escape postLoginQuery. Fixes #1797
2017-03-17 21:05:28 -07:00
Andrew Bauer
9d6a65abbe
have to use ln with -T flag to force overwrite of existing link
2017-03-17 09:32:58 -05:00
Isaac Connor
8834109812
code style and whitespace changes
2017-03-17 09:59:23 -04:00
Isaac Connor
c24853ad11
Merge pull request #1806 from adam900710/compile_fix
...
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
2017-03-17 09:42:15 -04:00
Isaac Connor
b041e299fc
Merge branch 'adam900710-compile_fix' into storageareas
2017-03-17 09:41:42 -04:00
Isaac Connor
654282d82e
fix merge
2017-03-17 09:41:04 -04:00
Isaac Connor
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
Andrew Bauer
0d4acb9bc8
Merge pull request #1811 from connortechnology/fix_crash_with_invalid_zones
...
Fix zmc crashing when zones are no good
2017-03-16 14:51:42 -05:00
Isaac Connor
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
Isaac Connor
6ee2549777
Fix zmc crashing when zones are no good
2017-03-16 10:50:31 -04:00
Andrew Bauer
9681a444b4
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
...
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
Andrew Bauer
7e0ac4b239
Merge pull request #1780 from connortechnology/fix_1775
...
use escapeshellarg on inputs to daemonControl and other functions
2017-03-16 09:27:04 -05:00
Isaac Connor
5bccd92b68
fix scoping of scale var
2017-03-16 09:53:53 -04:00
Kfir Itzhak
f7fcab24c4
Fixed a mistake in recent commit e7a681b8ff
2017-03-14 22:46:36 +02:00
Kfir Itzhak
f30192e5da
Use standard memcpy() on x86-64, as it behaves similar performs the equal or better
2017-03-14 22:41:35 +02:00
Kfir Itzhak
67f7ad40ae
Removed SSSE3 deinterlacing functions, as they were typically equal or slower than the standard code (when compiled with -O2 or better)
...
The function is too complicated to be vectorized efficiently
2017-03-14 22:36:26 +02:00
Kfir Itzhak
e7a681b8ff
Added BGRA, ARGB and ABGR variants of SSSE3 32bit color to grayscale conversion and made the code actually use them all
2017-03-14 22:29:55 +02:00
Kfir Itzhak
20604c2150
SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster
2017-03-14 16:54:00 +02:00
Kfir Itzhak
844b4bb5ee
SSSE3 delta functions now use less instructions and are 5-10% faster
2017-03-14 12:17:01 +02:00
Isaac Connor
63fb424bc7
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-13 15:43:12 -04:00
Isaac Connor
147c2546b3
include HAVE_MP4V2_MP4V2_H and MP4_H
2017-03-13 15:42:51 -04:00
Isaac Connor
d5312ce21f
fix libswscale for 1604
2017-03-13 15:37:55 -04:00
Isaac Connor
b22e48868b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-13 14:40:27 -04:00
Isaac Connor
67b7b76e1a
add libswresample and mp4v2
2017-03-13 14:40:01 -04:00
Isaac Connor
fc464d988c
add x264
2017-03-13 14:36:08 -04:00
Isaac Connor
1cbcd3612f
add libswscale4
2017-03-13 14:28:13 -04:00
Isaac Connor
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
Markos Vakondios
ed96013605
Mysql starts without upstart/systemd
2017-03-12 21:28:49 +02:00
Qu Wenruo
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
Isaac Connor
adbb5f431d
fix version of x264
2017-03-11 11:00:46 -05:00
Isaac Connor
21d3cd6835
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-11 10:48:39 -05:00
Isaac Connor
e04cc1be05
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
2017-03-11 10:41:39 -05:00
Isaac Connor
6ac6161af6
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-08 16:25:16 -05:00
Andy Bauer
e61a3fae9c
always delete then recreate Crud folder for redhat builds
2017-03-07 14:44:53 -06:00
Andy Bauer
d6caa7562f
move the check for trusty arch
2017-03-07 14:43:14 -06:00
Andy Bauer
f23e43ef85
add multiarch support
2017-03-07 14:24:06 -06:00
Isaac Connor
14c4a156c6
set img.src='' first so that Chrome closes the old stream.
2017-03-06 20:21:12 -05:00
Andrew Bauer
b514ab0b3c
remove double quotes
2017-03-06 18:56:44 -06:00
Andrew Bauer
bfe84e6a7c
move debain versioning into a function
2017-03-06 18:54:55 -06:00
Andrew Bauer
0ee6da84c0
set VERSION & RELEASE in trusty build
2017-03-06 18:41:48 -06:00
Andrew Bauer
0cf94c3573
echo VERSION and RELEASE
2017-03-06 18:27:45 -06:00