From 5000584fb2eb0531cf459bc3405c1432a1adf67d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 28 Apr 2017 01:24:34 +0200
Subject: Fix handle no watermark.

---
 bin/stream | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/stream b/bin/stream
index 59d7c20..eb0f892 100755
--- a/bin/stream
+++ b/bin/stream
@@ -85,8 +85,8 @@ ffmpeg -hide_banner -threads auto -re \
  ${IIDC:+-f libdc1394 -video_size 640x480 -framerate 15 -thread_queue_size 256 -i "$IIDC"} \
  ${LOGO:+-i "$LOGO"} \
  ${MAYBEVIDEO:+-filter_complex \
- "[$VSTREAMINDEX:v]scale=-1:$HEIGHT[bg]${LOGO:+;
-  [bg][$((VSTREAMINDEX+1)):v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]}"} \
+ "[$VSTREAMINDEX:v]scale=-1:$HEIGHT${WATERMARK:-[v]}${WATERMARK:+[bg]${LOGO:+;
+  [bg][$((VSTREAMINDEX+1)):v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]}}"} \
  ${MAYBEAUDIO:+-map '0:a' \
  -codec:a libopus -ac "$ACHANNELS" -ar "$AFRAMERATE" -b:a "$ABITRATE" \
  -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200"} \
-- 
cgit v1.2.3