From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Fri, 29 Nov 2024 09:27:59 +0000 (+0100)
Subject: fix absolute_focus=0
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6816059cfd3ec10c811e749a24460bbd35e4486e;p=telecaster-server.git

fix absolute_focus=0
---

diff --git a/etc/telecaster/telecaster.yml b/etc/telecaster/telecaster.yml
index ca3566b..6a10dcf 100644
--- a/etc/telecaster/telecaster.yml
+++ b/etc/telecaster/telecaster.yml
@@ -12,14 +12,7 @@ telecaster:
         width: 1280
         height: 720
         framerate: 30
-<<<<<<< HEAD
         flip: none
-=======
-        flip: rotate-180
-        zoom: 140
-        sharpness: 144
-        focus: 0
->>>>>>> 878e850 (fix absolute_focus=0)
         format: image/jpeg
         decoder: jpegdec
         audio_delay: 0