sync master

2023-05-19 05:47:49 -05:00
parent e357715a8c 76dbab6a8b
commit 42f3ee3de5
25 changed files with 404 additions and 60 deletions
--- a/frigate/test/test_ffmpeg_presets.py
+++ b/frigate/test/test_ffmpeg_presets.py
@@ -52,7 +52,7 @@ class TestFfmpegPresets(unittest.TestCase):
        assert "preset-rpi-64-h264" not in (
            " ".join(frigate_config.cameras["back"].ffmpeg_cmds[0]["cmd"])
        )
-        assert "-c:v h264_v4l2m2m" in (
+        assert "-c:v:1 h264_v4l2m2m" in (
            " ".join(frigate_config.cameras["back"].ffmpeg_cmds[0]["cmd"])
        )