mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-19 12:05:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
765 Commits 15 Branches 23 Tags
bd9028f4a6f2faf2d94cbba8b16dfd6404181d51
Commit Graph

765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Heenan
bd9028f4a6 Fix for crash accessing camera_id / corrupt config files 
The help comment didn't contain the necessary #s at the beginning.

Fixes #200
 2016-09-26 09:20:57 +01:00
Mr-Dave
769271721c Merge pull request #198 from slokhorst/rm-old-files 
Remove old files
 2016-09-25 20:51:49 -06:00
Mr-Dave
d095343133 Merge pull request #195 from jogu/misc-tweaks 
Small fixes for recent changes
 2016-09-25 12:25:48 -06:00
Sebastiaan Lokhorst
b2f495c496 Remove README.axis_2100 file which only has trivial instructions 2016-09-25 18:31:55 +02:00
Sebastiaan Lokhorst
3dcd57ee43 Remove old pwc-ioctl.h files, which are not used anywhere in the program 2016-09-25 18:31:31 +02:00
Joseph Heenan
3562d7da5b Update .gitignore for thread -> camera rename of config files 2016-09-25 13:46:45 +01:00
Joseph Heenan
7f16f567c7 Prevent blank line after ffmpeg log entries 
ffmpeg seems to put a \n on the end of messages, and MOTION_LOG also
adds one, so remove the ffmpeg one.
 2016-09-25 13:46:45 +01:00
Joseph Heenan
7668cb096c Fix for a couple of warnings in developer builds 2016-09-25 13:46:45 +01:00
Mr-Dave
7e16a9e601 Merge pull request #185 from slokhorst/systemd 
Add systemd service file
 2016-09-24 18:03:00 -06:00
Mr-Dave
a404c4b771 Merge pull request #189 from mterzo/camera_conf_dir 
Camera configuration directory
 2016-09-24 12:37:27 -06:00
Mike Terzo
61e7836e17 Camera configuration directory 2016-09-24 07:03:57 -04:00
Sebastiaan Lokhorst
82ca27beb5 Add systemd service file 
Remove Fedora initscript (use the systemd service file instead)
 2016-09-24 11:56:49 +02:00
Joseph Heenan
fcde5a2dfb Merge pull request #184 from slokhorst/html-cleanup 
Cleanup HTML.
 2016-09-24 09:22:30 +01:00
Joseph Heenan
b68ad37a7a Merge pull request #186 from pcwalden/master 
Adds --without-mmal option to configure.
 2016-09-24 09:21:10 +01:00
Joseph Heenan
90660c0d4c Merge pull request #182 from slokhorst/ipv6-hostname 
Fix hostname determination for IPv6 addresses in web server.
 2016-09-24 09:17:14 +01:00
Mr-Dave
5eedddbe72 Merge pull request #179 from tosiara/extpipe-update-examples 
Updated extpipe examples with ultrafast H264 (ffmpeg, mencoder and x264)
 2016-09-23 22:19:50 -06:00
Mr-Dave
ae85287b48 Merge pull request #188 from Mr-DaveDev/mask_resize 
Mask resize
 2016-09-23 22:19:16 -06:00
Mr-Dave
b8bab3763f Merge pull request #187 from Mr-DaveDev/camera_id 
Camera ID
 2016-09-23 21:31:27 -06:00
Mr-Dave
72193ccaff Merge pull request #176 from ffontaine/master 
Change --without-sdl to --with-sdl=[DIR]
 2016-09-23 21:25:42 -06:00
MrDave
e0f0261f01 Merge branch 'ccrisan-master' into mask_resize 2016-09-23 20:53:53 -06:00
MrDave
45f18a4dfe Log Level for Mask and Memory Leak 
Revise the log level to warning when the user has specified a pgm mask file that is
different than the size of the image from the camera.

Free the memory associated with mask image to close memory leak.
 2016-09-23 20:48:04 -06:00
MrDave
22b81cfc1a Additional changes for move to camera instead of thread 2016-09-23 17:57:13 -06:00
Philip Walden
8cedff6dfe Adds --without-mmal option to configure. 
As documented in issue 169, the recentlay added MMAL camera support for the
Raspberry Pi does not build on the Wheezy version of Raspbian.
This option disables the autoconf generation of MMAL dependencies.
 2016-09-23 07:57:38 -07:00
Sebastiaan Lokhorst
74e9cbe081 Fix another hostname issue, where the hostname would contain the next header line, when the 
Hostname header was empty or malformed.
 2016-09-23 11:36:50 +02:00
Sebastiaan Lokhorst
aa7ba3984e Cleanup HTML. 2016-09-22 18:36:00 +02:00
Sebastiaan Lokhorst
0a22df1547 Fix string length in memchr call. 2016-09-22 16:34:18 +02:00
Sebastiaan Lokhorst
249967e669 Fix hostname determination for IPv6 addresses in web server. 2016-09-22 16:01:20 +02:00
Joseph Heenan
1d74158bce Merge pull request #181 from ffontaine/jpeg-turbo-fixes 
Fix LIBS and CFLAGS when jpeg-turbo is enabled
 2016-09-22 08:43:30 +01:00
MrDave
f95baa1043 Merge branch 'camera_id' of https://github.com/mterzo/motion into mterzo-camera_id 2016-09-21 19:48:26 -06:00
tosiara
6b98805913 Updated motion_guide.htm with extpipe description and examples 2016-09-21 10:56:04 +03:00
Fabrice Fontaine
02bda9d56d Fix LIBS and CFLAGS when jpeg-turbo is enabled 
When jpeg-turbo was enabled, LIBS was uncorrectly set: -lpthread, -lm,
... was lost. Same issue with CFLAGS.

Fixes #17.

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-09-20 22:33:13 +02:00
Joseph Heenan
7091156808 Merge pull request #180 from ffontaine/jpeg-turbo-fixes 
Fix jpeg-turbo detection
 2016-09-20 08:34:57 +01:00
Fabrice Fontaine
41c841f2fb Fix jpeg-turbo detection 
Commit number 4998d465f7 added the detection of jpeg-turbo dynamic library through -o but -f argument was missing so test was always true

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-09-19 23:26:54 +02:00
Fabrice Fontaine
736f9bb3f9 Change --without-sdl to --with-sdl=[DIR] 
With this modification, the user will be able to specify the path to
sdl-config which can be outside his path (for example on embedded
buildsystem such as buildroot)

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-09-18 20:33:08 +02:00
Joseph Heenan
709f626b7e Merge pull request #174 from ffontaine/master 
Fix detection of sqlite3 when cross-compiling
 2016-09-17 21:33:21 +01:00
Joseph Heenan
7d54c3949e Fix for first captured picture after start up is zero length 
If the first fopen() failed, then myfopen() always returned NULL even if
the second fopen() succeeded. Now it correctly returns the result of the
second fopen().

Authored by https://github.com/pcwalden

Closes #155
 2016-09-17 20:32:53 +01:00
Calin Crisan
787fad43fe automatically resize mask image if size differs from that of the captured image 2016-09-17 21:18:46 +03:00
Fabrice Fontaine
d1a2397daa Fix detection of sqlite3 when cross-compiling 
Replace usage of AC_CHECK_FILE by test -f to check the existence of
sqlite3.c as AC_CHECK_FILE does not work when cross-compiling

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-09-16 20:25:51 +02:00
Joseph Heenan
65d6b90c8a Merge pull request #170 from mterzo/tavis-ci-trusty 
Adding ubuntu 14.04 to build along with 12.04 in travis-ci
 2016-09-16 19:18:16 +01:00
Joseph Heenan
c80466df66 Merge pull request #173 from ffontaine/master 
Fix jpeg-turbo detection
 2016-09-16 19:15:01 +01:00
Fabrice Fontaine
4998d465f7 Fix jpeg-turbo detection 
Do not only check for static libjpeg.a but also for dynamic libjpeg.so

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
 2016-09-16 19:55:44 +02:00
Mike Terzo
beded86fc5 Renamed thread to camera to more clearly define what 
thread is.  Keeping backwards compatability with
thread so that old configs can still be used.
 2016-09-16 03:04:10 -04:00
Mike Terzo
b53b26c180 Adding ubuntu 14.04 to build along with 12.04 in travis-ci 2016-09-16 00:04:42 -04:00
Joseph Heenan
f219f812a1 Merge pull request #167 from Mr-DaveDev/netcam-messages 
Suppress some messages from avcodec
 2016-09-12 07:26:08 +01:00
Joseph Heenan
7389bcada3 Merge pull request #168 from Mr-DaveDev/loopback-warnings 
Remove unused variables in vloopback_motion
 2016-09-12 07:23:57 +01:00
Joseph Heenan
57254da041 Merge pull request #166 from Mr-DaveDev/old-ffmpeg 
MYPixelFormat Revision
 2016-09-12 07:22:46 +01:00
MrDave
12f5cdd060 Remove unused variables of ostatus and loop 2016-09-11 22:58:14 -06:00
MrDave
6d384fd106 Suppress excessive and unfixable avcodec messages 2016-09-11 22:53:17 -06:00
MrDave
b9f4ca8578 Revise the condition for the MYPixelFormat to use the AVFORMAT version number 2016-09-11 21:43:13 -06:00
Mr-Dave
8da1ec0d3e Merge pull request #162 from jogu/mysql-thread-safe-init 
Possible fix for failure to connect to mysql on startup
 2016-09-11 20:43:52 -06:00