chris/frigate
1
0
Fork 0
forked from Github/frigate
Code Pull Requests Packages Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
Blake Blackshear
2022-11-05 09:27:38 -05:00
parent 02caeb9f87 e15b2627fc
commit 95343b6094
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/FUNDING.yml vendored
View File

@@ -1,3 +1,3 @@
github: github:
- blakeblackshear - blakeblackshear
- paularmstrong - NickM-27

2
docs/docs/configuration/birdseye.md
View File

@@ -11,7 +11,7 @@ Birdseye offers different modes to customize which cameras show under which circ
### Custom Birdseye Icon ### Custom Birdseye Icon
A custom icon can be added to the birdseye background by provided a file `custom.png` inside of the Frigate `media` folder. The file must be a png with the icon as transparent, any non-transparent pixels will be white when displayed in the birdseye view. A custom icon can be added to the birdseye background by providing a 180x180 image named `custom.png` inside of the Frigate `media` folder. The file must be a png with the icon as transparent, any non-transparent pixels will be white when displayed in the birdseye view.
### Birdseye view override at camera level ### Birdseye view override at camera level

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

@@ -8,7 +8,7 @@ title: Camera Specific Configurations
The input and output parameters need to be adjusted for MJPEG cameras The input and output parameters need to be adjusted for MJPEG cameras
```yaml ```yaml
input_args: -avoid_negative_ts make_zero -fflags nobuffer -flags low_delay -strict experimental -fflags +genpts+discardcorrupt -use_wallclock_as_timestamps 1 input_args: -avoid_negative_ts make_zero -fflags nobuffer -flags low_delay -strict experimental -fflags +genpts+discardcorrupt -use_wallclock_as_timestamps 1 -c:v mjpeg
``` ```
Note that mjpeg cameras require encoding the video into h264 for recording, and rtmp roles. This will use significantly more CPU than if the cameras supported h264 feeds directly. Note that mjpeg cameras require encoding the video into h264 for recording, and rtmp roles. This will use significantly more CPU than if the cameras supported h264 feeds directly.

2
docs/docusaurus.config.js
View File

@@ -35,7 +35,7 @@ module.exports = {
position: 'right', position: 'right',
}, },
{ {
href: 'https://demo.frigate.video', href: 'http://demo.frigate.video',
label: 'Demo', label: 'Demo',
position: 'right', position: 'right',
}, },