mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-08-22 13:47:29 +02:00
Fix rebase conflict
This commit is contained in:
parent
1b5967d7f2
commit
e3d0903120
@ -15,12 +15,6 @@ cameras:
|
|||||||
# values that begin with a "$" will be replaced with environment variable
|
# values that begin with a "$" will be replaced with environment variable
|
||||||
password: $RTSP_PASSWORD
|
password: $RTSP_PASSWORD
|
||||||
path: /cam/realmonitor?channel=1&subtype=2
|
path: /cam/realmonitor?channel=1&subtype=2
|
||||||
################
|
|
||||||
## Optional URL format. Specifying this will override the default RTSP URL format.
|
|
||||||
## Some cameras support the RTMP protocol which may give better performance.
|
|
||||||
################
|
|
||||||
# urlformat: rtmp://{host}:{port}{path}&user={user}&password={password}
|
|
||||||
|
|
||||||
|
|
||||||
################
|
################
|
||||||
## Optional URL format. Specifying this will override the default RTSP URL format.
|
## Optional URL format. Specifying this will override the default RTSP URL format.
|
||||||
|
Loading…
Reference in New Issue
Block a user