db6aab2071
Merge pull request #1145 from liucougar/merge_with_master
...
Merging master to feature-h264-videostorage
2015-11-05 16:37:15 +11:00
44f63443c1
video branch ffmpeg 2.9 fixes
...
ffmpeg 2.9 patched removed SSE2 CPU
2015-11-04 14:43:45 -08:00
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
1f1b48ed51
Added Vivotek ePTZ control to zm_create.sql
2015-11-04 19:17:47 +01:00
b611d9fcae
Bump database version to 1.28.109
2015-11-04 17:29:37 +01:00
330e0d7adf
Add Vivotek ePTZ control module to database
2015-11-04 17:29:07 +01:00
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
80d3e0be80
Merge pull request #1139 from SteveGilvarry/Travis_ffmpeg2.8.1
...
Update Travis to ffmpeg 2.8.1 for testing
2015-11-04 10:01:20 -06:00
11f10e5e7c
Merge pull request #1142 from SteveGilvarry/pr/1137
...
Update to #1137 for backward compatibility.
2015-11-04 09:59:57 -06:00
cb19113c88
Merge pull request #1143 from SteveGilvarry/FixBuildWarnings
...
Fix build warnings specific to h264 branch
2015-11-05 01:46:50 +11:00
5423be9eb8
Revert space removal around PRId64
2015-11-05 01:25:44 +11:00
5b68656602
Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
2015-11-05 01:09:39 +11:00
1c479a01f2
Fix PRId64 issue in travis, another try
2015-11-05 00:34:48 +11:00
078dc85548
Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
2015-11-04 22:52:47 +11:00
dc0506c597
Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
2015-11-04 22:33:29 +11:00
57c0662ad0
Update README.md
2015-11-04 17:13:05 +11:00
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
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
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
5a931db956
Merge pull request #1121 from knnniggett/revproxy
...
Use relative URL's instead of absolute
2015-11-04 00:34:12 +11:00
97b70b0e28
Update Travis to ffmpeg 2.8.1 for testing
2015-11-03 14:57:35 +11:00
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
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
e507abeb38
Merge pull request #1133 from liucougar/fix_savejpegs
...
fixed SaveJPEGs are not working
2015-11-01 16:36:00 +11:00
17e65d12b4
fixed SaveJPEGs are not working
...
which is caused in errors introduced when merging with master
2015-10-31 21:27:23 -07:00
b28a562f1b
Merge branch 'master' into multi-server
2015-10-30 12:32:42 -04:00
920bea8deb
split up depends into multiple lines
2015-10-30 12:19:43 -04:00
589ee2f37b
split up depends into multiple lines
2015-10-30 12:19:35 -04:00
a45a52601d
change format to native, which makes building packages so much easier
2015-10-30 12:19:12 -04:00
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
bc261c544e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-10-30 11:28:44 -04:00
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
55fce55518
Merge pull request #1130 from inflex/h264-mkv
...
Fixes for crashes from bad packets to av_interleaved_write_frame
2015-10-30 23:06:21 +11:00
cad374db50
Merge pull request #1 from SteveGilvarry/h264-mkv
...
Remove syslog.h
2015-10-30 21:36:06 +10:00
650d93435e
Remove syslog.h
2015-10-30 21:42:58 +11:00
6e2e33cf89
Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
2015-10-30 19:05:40 +10:00
ef18714687
Merge pull request #1127 from SteveGilvarry/feature-h264-videostorage
...
Merging master to feature-h264-videostorage
2015-10-28 08:36:49 +11:00
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
f5fedde139
Merge pull request #1125 from liucougar/smart_video_or_image
...
better way of detecting showing image or video in timeline and event view
2015-10-26 08:07:17 +11:00
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
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
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
d47edbbb87
Merge pull request #1123 from baffo32/patch-1
...
Stray semicolon causes SQL error. Fixes #1122
2015-10-24 16:06:38 -06:00
d0ce4904ff
Stray semicolon causes SQL error
...
also normalized space around '='
2015-10-24 17:58:20 -04:00
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
de3e7784d5
Merge pull request #1120 from ZoneMinder/zmupdate-url
...
Update version check URL
2015-10-23 19:02:44 -06:00
029044bca3
merge master, bump version
2015-10-23 16:14:49 -04:00
e37cf0e218
append /www to docroot for all debian/ubuntu dists
2015-10-23 16:08:32 -04:00
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
Steve Gilvarry
Heng Liu
Pliable Pixels
Robin Daermann
Andrew Bauer
SteveGilvarry
Dmitry Smirnov
Isaac Connor
Paul (Jack) Daniels
inflex
baffo32
Kyle Johnson