From a1afc1cac4a3bd88abddd9e1db1cd546ebbadf77 Mon Sep 17 00:00:00 2001 From: YS Date: Wed, 9 Feb 2022 15:04:25 +0300 Subject: [PATCH] fix merge error --- frigate/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frigate/config.py b/frigate/config.py index 219ad75b8..8af7b1721 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -551,7 +551,7 @@ class CameraLiveConfig(FrigateBaseModel): class CameraConfig(FrigateBaseModel): 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( title="GStreamer configuration for the camera." )