From 73c58e6cf15a921197a6e85422cb061fe01b0f53 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 27 Apr 2017 20:09:46 +0200
Subject: Use mapping (not audio/video supporession), and consistently use
 complex filter (not video filter).

---
 bin/decode+edit+encode+stream | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/decode+edit+encode+stream')

diff --git a/bin/decode+edit+encode+stream b/bin/decode+edit+encode+stream
index 3914825..6657211 100755
--- a/bin/decode+edit+encode+stream
+++ b/bin/decode+edit+encode+stream
@@ -28,13 +28,13 @@ VBITRATE=256000
 ffmpeg -hide_banner -threads auto -re \
  -i "$INPUT" \
  -i "$LOGO" \
- -vf \
+ -filter_complex \
  "[0:v]scale=-1:$HEIGHT[bg];
-  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \
+  [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20[v]" \
+ -map '0:a' \
  -codec:a libopus -ac "$ACHANNELS" -ar "$AFRAMERATE" -b:a "$ABITRATE" \
- -vn \
  -f rtp -payload_type 111 "rtp://$IP:$FIRSTPORT?pkt_size=1200" \
- -an \
+ -map '[v]' \
  -pix_fmt yuv420p \
  -codec:v vp8 -quality realtime -deadline 1000000 -cpu-used 15 \
  -b:v "$VBITRATE" -minrate "$VBITRATE" -maxrate "$VBITRATE" \
-- 
cgit v1.2.3