d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
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
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
6ee2549777
Fix zmc crashing when zones are no good
2017-03-16 10:50:31 -04:00
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
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
5bccd92b68
fix scoping of scale var
2017-03-16 09:53:53 -04:00
f7fcab24c4
Fixed a mistake in recent commit e7a681b8ff
2017-03-14 22:46:36 +02:00
f30192e5da
Use standard memcpy() on x86-64, as it behaves similar performs the equal or better
2017-03-14 22:41:35 +02:00
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
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
20604c2150
SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster
2017-03-14 16:54:00 +02:00
844b4bb5ee
SSSE3 delta functions now use less instructions and are 5-10% faster
2017-03-14 12:17:01 +02:00
63fb424bc7
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-13 15:43:12 -04:00
147c2546b3
include HAVE_MP4V2_MP4V2_H and MP4_H
2017-03-13 15:42:51 -04:00
d5312ce21f
fix libswscale for 1604
2017-03-13 15:37:55 -04:00
b22e48868b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-13 14:40:27 -04:00
67b7b76e1a
add libswresample and mp4v2
2017-03-13 14:40:01 -04:00
fc464d988c
add x264
2017-03-13 14:36:08 -04:00
1cbcd3612f
add libswscale4
2017-03-13 14:28:13 -04:00
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
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
adbb5f431d
fix version of x264
2017-03-11 11:00:46 -05:00
21d3cd6835
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-11 10:48:39 -05:00
e04cc1be05
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
2017-03-11 10:41:39 -05:00
6ac6161af6
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-08 16:25:16 -05:00
e61a3fae9c
always delete then recreate Crud folder for redhat builds
2017-03-07 14:44:53 -06:00
d6caa7562f
move the check for trusty arch
2017-03-07 14:43:14 -06:00
f23e43ef85
add multiarch support
2017-03-07 14:24:06 -06:00
14c4a156c6
set img.src='' first so that Chrome closes the old stream.
2017-03-06 20:21:12 -05:00
b514ab0b3c
remove double quotes
2017-03-06 18:56:44 -06:00
bfe84e6a7c
move debain versioning into a function
2017-03-06 18:54:55 -06:00
0ee6da84c0
set VERSION & RELEASE in trusty build
2017-03-06 18:41:48 -06:00
0cf94c3573
echo VERSION and RELEASE
2017-03-06 18:27:45 -06:00
4df12ae370
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
2017-03-06 17:30:00 -05:00
d3f7451736
Merge branch 'storageareas' into montage_width_height
2017-03-06 16:56:18 -05:00
6dc2b13aee
change package versioning scheme
2017-03-06 15:25:54 -06:00
fdcb93eacc
Merge branch 'master' into storageareas
2017-03-06 16:22:28 -05:00
3f7583ebda
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-06 16:22:25 -05:00
07a9a8bf70
check the built package exists signal failure if it doesn't
2017-03-06 06:50:59 -06:00
297e9b0463
remove set -e, deploy on master branch only
2017-03-05 14:02:02 -06:00
42887c8c2c
specify the deb package name more precisely
2017-03-05 13:44:42 -06:00
26fbc04f7c
fix typo
2017-03-05 13:41:17 -06:00
858b49a603
remove all patches
2017-03-05 13:04:37 -06:00
5ea9f695de
Merge branch 'master' into travis_test1
2017-03-05 13:02:59 -06:00
ca71ee8e71
remove rules.new
2017-03-05 12:40:27 -06:00
4fe70f0e7d
recreate patch
2017-03-05 12:39:03 -06:00
2686946ce9
Merge pull request #1800 from knnniggett/fix_deb_zm.conf_perms
...
fix permissions on zm.conf in deb pkg scripts
2017-03-05 13:32:48 -05:00
c6fc6cb0ca
change patch method
2017-03-05 11:46:45 -06:00
7e0860f6bf
move patch after symlink is established
2017-03-05 11:37:22 -06:00
Isaac Connor
Andrew Bauer
Isaac Connor
Kfir Itzhak
Qu Wenruo
Andy Bauer
Andrew Bauer