Skip to content

Commit b103dc0

Browse files
Mr-DaveDevMr-Dave
authored andcommitted
Documentation Update (#534)
* Documentation Update
1 parent 336734e commit b103dc0

File tree

5 files changed

+485
-450
lines changed

5 files changed

+485
-450
lines changed

INSTALL

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
1-
The following is a brief overview of the building and installing instructions.
1+
The following is a brief overview of the building and installing instructions for debian / ubuntu.
22

3-
For full instructions on how to build and install Motion, see the
4-
motion_guide.html that is distributed with this source code.
3+
For full instructions on how to build and install Motion, see the motion_guide.html that is
4+
distributed with this source code. The guide also includes instructions for building Motion
5+
on distributions other than debian/ubuntu such as BSD, Mac and Centos.
56

6-
The building instructions vary based upon the base system and the desired options.
7-
For most installs, it will be desired to include either ffmpeg or libav and these will
8-
have associated dependencies which dictate the configuration options.
7+
The packages and library names change frequently and vary across base operating systems.
8+
Adjust the following lines as required by the base operating system.
99

10-
Build Packages:
11-
autoconf
12-
automake
13-
pkgconf
14-
libtool
15-
libjpeg8-dev
16-
build-essential
17-
libzip-dev
10+
Install basic build packages:
11+
sudo apt-get install autoconf automake pkgconf libtool libjpeg8-dev build-essential libzip-dev
1812

19-
The option to include FFMPEG or Libav functionality in motion is a choice of one OR the other not both.
20-
The packages and library names change frequently and vary across base operating systems. If ffmpeg or
21-
libav are built and installed from source the custom motion configuration options will usually be needed.
22-
23-
FFMPEG Packages
24-
libavformat-dev
25-
libavcodec-dev
26-
libavutil-dev
27-
libswscale-dev
28-
libavdevice-dev
29-
30-
Libav Packages
31-
libavformat-dev
32-
libavcodec-dev
33-
libavutil-dev
34-
libswscale-dev
35-
libavdevice-dev
13+
Install FFMPEG packages
14+
sudo apt-get install libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev
3615

3716
Once required packages are installed, execute:
3817
autoreconf -fiv

README.FreeBSD

Lines changed: 0 additions & 47 deletions
This file was deleted.

README.MacOSX

Lines changed: 0 additions & 30 deletions
This file was deleted.

motion.1

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH MOTION 1 2017-10-29 "Motion" "Motion Options and Config Files"
1+
.TH MOTION 1 2017-11-05 "Motion" "Motion Options and Config Files"
22
.SH NAME
33
motion \- Detect motion using a video4linux device or network camera
44
.SH SYNOPSIS
@@ -28,9 +28,6 @@ Run in non-daemon mode.
2828
.B \-s
2929
Run in setup mode. Also forces non-daemon mode.
3030
.TP
31-
.B \-o
32-
Dump config options to log (for support purposes).
33-
.TP
3431
.B \-d
3532
Run with message log level 1-9.
3633
.TP
@@ -197,6 +194,10 @@ V4L2_PIX_FMT_UYVY : 14 'UYVY'
197194
V4L2_PIX_FMT_YUYV : 15 'YUYV'
198195
V4L2_PIX_FMT_YUV422P : 16 '422P'
199196
V4L2_PIX_FMT_YUV420 : 17 'YU12'
197+
V4L2_PIX_FMT_Y10 : 18 'Y10'
198+
V4L2_PIX_FMT_Y12 : 19 'Y12'
199+
V4L2_PIX_FMT_GREY : 20 'GREY'
200+
V4L2_PIX_FMT_H264 : 21 'H264'
200201
.RE
201202
Default: 17
202203
Description:
@@ -1598,15 +1599,8 @@ Specified whether the web control/preview page should be raw or html format. Pr
15981599
.nf
15991600
Values:
16001601
.RS
1601-
0 = disabled
1602-
1 = Basic authentication
1603-
2 = MD5 digest (the safer authentication)
1604-
.RE
1605-
Default: 0
1606-
Description:
1607-
.fi
1608-
.RS
1609-
The authentication method to use for viewing the web control.
1602+
The username and password to use for authentication of the webcontrol.
1603+
The format is Username:Password
16101604
.RE
16111605
.RE
16121606

0 commit comments

Comments
 (0)