Robin Daermann
4c773472bd
Add support for IPv6 in RTSP code
...
Monitors with source type 'remote' can now be accessed over IPv6. This
code uses getaddrinfo(3) now instead of gethostbyname(3) - and changes a
lot of networking stuff which should be tested thoroughly.
2015-11-04 16:41:47 +01:00
SteveGilvarry
5ba13f1a76
ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected
...
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
2015-11-04 16:24:39 +11:00
SteveGilvarry
51914994f7
Migrating from av_free/av_freep to av_frame_free using libavcodec version
...
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
2015-11-04 15:30:14 +11:00
SteveGilvarry
bc5ef6c599
Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version
...
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
2015-11-04 12:46:26 +11:00
Steve Gilvarry
5a931db956
Merge pull request #1121 from knnniggett/revproxy
...
Use relative URL's instead of absolute
2015-11-04 00:34:12 +11:00
SteveGilvarry
97b70b0e28
Update Travis to ffmpeg 2.8.1 for testing
2015-11-03 14:57:35 +11:00
dreaddy
35617a6cf7
#1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter
2015-11-02 22:16:10 -05:00
Dmitry Smirnov
0ff7a4e616
Replace deprecated FFmpeg API
...
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
2015-11-03 11:58:23 +11:00
Pliable Pixels
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
Isaac Connor
b28a562f1b
Merge branch 'master' into multi-server
2015-10-30 12:32:42 -04:00
Isaac Connor
920bea8deb
split up depends into multiple lines
2015-10-30 12:19:43 -04:00
Isaac Connor
589ee2f37b
split up depends into multiple lines
2015-10-30 12:19:35 -04:00
Isaac Connor
a45a52601d
change format to native, which makes building packages so much easier
2015-10-30 12:19:12 -04:00
Isaac Connor
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
Isaac Connor
bc261c544e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-10-30 11:28:44 -04:00
Isaac Connor
2115eacdd0
revert change to not overwite zm.conf. It's not right, and it is screwing up package building
2015-10-30 11:28:34 -04:00
Andrew Bauer
a85dda3407
Merge pull request #1124 from baffo32/symlink-install
...
Install nph-zms with FILES so it is listed in install_manifest.txt
2015-10-24 21:55:47 -05:00
baffo32
44cda8032b
Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall
2015-10-24 20:07:42 -04:00
Kyle Johnson
d47edbbb87
Merge pull request #1123 from baffo32/patch-1
...
Stray semicolon causes SQL error. Fixes #1122
2015-10-24 16:06:38 -06:00
baffo32
d0ce4904ff
Stray semicolon causes SQL error
...
also normalized space around '='
2015-10-24 17:58:20 -04:00
Andy Bauer
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
Kyle Johnson
de3e7784d5
Merge pull request #1120 from ZoneMinder/zmupdate-url
...
Update version check URL
2015-10-23 19:02:44 -06:00
Isaac Connor
029044bca3
merge master, bump version
2015-10-23 16:14:49 -04:00
Isaac Connor
e37cf0e218
append /www to docroot for all debian/ubuntu dists
2015-10-23 16:08:32 -04:00
Kyle Johnson
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
Andrew Bauer
5608884bfa
Merge pull request #1116 from ZoneMinder/add-index-to-frames
...
Add index to frames
2015-10-22 13:28:04 -05:00
Kyle Johnson
030792d861
Remove files accidentally added in 9dcb3e1df3
2015-10-22 12:15:38 -06:00
Kyle Johnson
e51ff0677f
Fix typo in Frames index creation. I hope
2015-10-22 12:12:56 -06:00
Kyle Johnson
9dcb3e1df3
Add Index to Frames table. Fixes #1085 .
2015-10-22 11:40:25 -06:00
Kyle Johnson
356fadbff8
Add index to Frames table for people updating
2015-10-22 11:36:55 -06:00
Kyle Johnson
746e695448
Add index to Frames table upon new creation
2015-10-22 11:25:32 -06:00
Isaac Connor
d0e5dd62b5
Merge pull request #1103 from seebaer1976/patch-6
...
Update preinst
2015-10-16 12:06:44 -04:00
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
seebaer1976
7ebf3de8a2
Update preinst
...
korrektur
2015-10-09 18:13:13 +02:00
Isaac Connor
8db4c22192
Merge pull request #1100 from seebaer1976/patch-2
...
Update links
2015-10-09 09:23:32 -04:00
Isaac Connor
729e9536d7
Merge pull request #1101 from seebaer1976/patch-4
...
Update rules
2015-10-09 09:23:13 -04:00
Isaac Connor
79078f8308
Merge pull request #1102 from seebaer1976/patch-5
...
Update apache.conf
2015-10-09 09:22:55 -04:00
Isaac Connor
6c51f568a1
Merge pull request #1099 from seebaer1976/patch-3
...
Update preinst
2015-10-09 09:22:36 -04:00
seebaer1976
b17819d181
Update apache.conf
...
Update links
2015-10-09 13:50:15 +02:00
seebaer1976
b042152694
Update rules
...
update links
2015-10-09 13:48:26 +02:00
seebaer1976
4284f8b089
Update preinst
...
Update links
2015-10-09 13:45:19 +02:00
seebaer1976
23a6000380
Update links
...
Update links
2015-10-09 13:41:02 +02:00
Isaac Connor
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
Isaac Connor
1d173a9bf0
Merge pull request #1083 from pliablepixels/1082-monitor-orange
...
fixed orange display for monitor mode
2015-10-06 08:36:35 -04:00
Isaac Connor
1882300a41
Merge pull request #1094 from pliablepixels/1051-zmupdate-versioncompare-problems
...
fixed version compare logic
2015-10-06 08:35:46 -04:00
Pliable Pixels
e0e048fe7e
fixed version compare logic
2015-10-04 09:10:05 -04:00
Andy Bauer
b74abe88c9
minor centos 7 specfile change
2015-10-03 17:07:22 -05:00
Andrew Bauer
1dbea023b8
Update README.md
...
remove draft note
2015-10-03 15:33:04 -05:00
Andrew Bauer
3242cde0bf
move zm.conf under /etc/zm for Fedora
2015-10-03 13:38:51 -05:00