diff options
author | Jonas Smedegaard <dr@jones.dk> | 2017-05-06 22:40:52 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2017-05-06 22:40:52 +0200 |
commit | b77ca256d6bf3367a2c4d8627dbaa318949437b7 (patch) | |
tree | f9f9e14247a913acdf1a8bdf8325dbbf80a4f018 | |
parent | ebbb355e6b74af1fad5cec8397abea2764b8ba57 (diff) |
Fix support inserting logo.
-rwxr-xr-x | bin/stream | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 \ |