Merge branch 'feature/pipewire-tc43' into dev

diff --cc bin/streaming/telecaster.py
index bad71bd2ec8b5e678e57fbc3f66b8fcec7e4427b,7a275860e874070d0ee0363d29a4674438d28c4c..e6686dbf14bef358cf28e9425ef6d0d84df09241
--- 1/bin/streaming/telecaster.py
--- 2/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 \