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

.github/FUNDING.yml

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

docs/docs/configuration/birdseye.md

@@ -11,7 +11,7 @@ Birdseye offers different modes to customize which cameras show under which circ
 
 ### 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
 

docs/docs/configuration/camera_specific.md

@@ -8,7 +8,7 @@ title: Camera Specific Configurations
 The input and output parameters need to be adjusted for MJPEG cameras
 
 ```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.

docs/docusaurus.config.js

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