administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-02 09:15:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
YS 2022-02-09 15:04:25 +03:00
parent 1f280111e8
commit a1afc1cac4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frigate/config.py
View File

@ -551,7 +551,7 @@ class CameraLiveConfig(FrigateBaseModel):
class CameraConfig(FrigateBaseModel): class CameraConfig(FrigateBaseModel):
name: Optional[str] = Field(title="Camera name.", regex="^[a-zA-Z0-9_-]+$") name: Optional[str] = Field(title="Camera name.", regex="^[a-zA-Z0-9_-]+$")
ffmpeg: CameraFfmpegConfig = Field(title="FFmpeg configuration for the camera.") ffmpeg: Optional[CameraFfmpegConfig] = Field(title="FFmpeg configuration for the camera.")
gstreamer: Optional[CameraGStreamerConfig] = Field( gstreamer: Optional[CameraGStreamerConfig] = Field(
title="GStreamer configuration for the camera." title="GStreamer configuration for the camera."
) )