diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-04-28 01:24:34 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-28 01:24:34 +0200 |
| commit | 5000584fb2eb0531cf459bc3405c1432a1adf67d (patch) | |
| tree | c553841bc622873973510ebb1aa0af24685d48b8 | |
| parent | 4fe8ee6bdc82dfe0587d91cc3d5db36e436544ad (diff) | |
Fix handle no watermark.
| -rwxr-xr-x | bin/stream | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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"} \ |