From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Wed, 12 Mar 2025 15:31:41 +0000 (+0100)
Subject: Merge branch 'feature/pipewire-tc43' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=25d6226f7c4c1910663202051e10cd3cb99cc742;p=telecaster-server.git

Merge branch 'feature/pipewire-tc43' into dev
---

25d6226f7c4c1910663202051e10cd3cb99cc742
diff --cc bin/streaming/telecaster.py
index bad71bd,7a27586..e6686db
--- a/bin/streaming/telecaster.py
+++ b/bin/streaming/telecaster.py
@@@ -8,9 -8,10 +8,13 @@@ import yam
  from threading import Thread
  from copy import deepcopy
  
 -#    ! queue ! clockoverlay time-format="%D %H:%M:%S" \
  
  VIDEO_PIPELINE_BASE="""pipewiresrc client-name="video_streaming" \
++<<<<<<< HEAD
 +    ! {format}, width={width}, height={height}, framerate={framerate}/1 \
++=======
+     ! {format}, width=[{width}], height={height}, framerate={framerate}/1 \
++>>>>>>> feature/pipewire-tc43
      ! queue ! {decoder} \
      ! queue ! videoflip method={flip} \
      ! queue ! videoconvert \