From b77ca256d6bf3367a2c4d8627dbaa318949437b7 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 6 May 2017 22:40:52 +0200
Subject: Fix support inserting logo.

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

(limited to 'bin/stream')

diff --git a/bin/stream b/bin/stream
index f3fa019..667e8af 100755
--- a/bin/stream
+++ b/bin/stream
@@ -121,8 +121,8 @@ ffmpeg -hide_banner -threads auto -re \
  ${LOGO:+-i "$LOGO"} \
  ${HASVIDEO:+-filter_complex \
  "[$VSTREAMINDEX:v]split=$HEIGHTCOUNT$(printf_each '[s%s]' "$HEIGHTS");
-  [s$height]scale=-2:$height${WATERMARK:-[v$height]}${WATERMARK:+[bg$height]${LOGO:+;
-  [bg$height][$((VSTREAMINDEX+1)):v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v$height]}};
+  [s$height]scale=-2:$height${WINPUT:+[bg$height]${LOGO:+;
+  [bg$height][$((VSTREAMINDEX+1)):v]overlay=main_w-overlay_w-20:main_h-overlay_h-20}}[v$height];
   [v$height]split=$VCODECCOUNT$(printf_each '[v%swebm]' "$HEIGHTS_WEBM")$(printf_each '[v%smpeg]' "$HEIGHTS_MPEG")" } \
  ${SAVEDIR:+-map '0:' ${TWOSOURCES:+-map '1:'} \
  -codec copy \
-- 
cgit v1.2.3