Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Resolve conflict (#7264)

Browse Source
This commit is contained in:
Sean Kelly 2023-07-23 09:52:41 -07:00 committed by GitHub
parent 6a4f317403
commit 157b160b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/docs/configuration/camera_specific.md
View File

@ -108,18 +108,10 @@ According to [this discussion](https://github.com/blakeblackshear/frigate/issues
```yaml ```yaml
go2rtc: go2rtc:
streams: streams:
<<<<<<< Updated upstream
your_reolink_camera: your_reolink_camera:
- http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password
- "ffmpeg:your_reolink_camera#audio=opus"
your_reolink_camera_sub:
- http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password
=======
reolink:
- "ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password#video=copy#audio=copy#audio=opus" - "ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password#video=copy#audio=copy#audio=opus"
reolink_sub: your_reolink_camera_sub:
- "ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password" - "ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password"
>>>>>>> Stashed changes
cameras: cameras:
reolink: reolink: