diff options
author | Jonas Smedegaard <dr@jones.dk> | 2017-02-27 20:54:00 +0000 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2017-02-27 20:54:00 +0000 |
commit | 6ce57b47f050c39fbf28f4af639ef19608a74cfa (patch) | |
tree | b6ef01437b5b8d9f0038ce9965792f7e69eb86f1 /example-scripts/ffmpeg/stream-combined.sh | |
parent | f953824dd2a18f15c2beeb5bd792f5f13fb75a44 (diff) |
Use voctobox (not localhost) as voctocore host.
Diffstat (limited to 'example-scripts/ffmpeg/stream-combined.sh')
-rwxr-xr-x | example-scripts/ffmpeg/stream-combined.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/example-scripts/ffmpeg/stream-combined.sh b/example-scripts/ffmpeg/stream-combined.sh index 9ee74f3..26aec64 100755 --- a/example-scripts/ffmpeg/stream-combined.sh +++ b/example-scripts/ffmpeg/stream-combined.sh @@ -1,5 +1,11 @@ #!/bin/sh +confdir="`dirname "$0"`/../" +. $confdir/default-config.sh +if [ -f $confdir/config.sh ]; then + . $confdir/config.sh +fi + # # a variation of this script was used to generate all combinations of # [native|translated|stereo]_[hd|sd|slides] streams for 33c3 @@ -7,9 +13,9 @@ ffmpeg -y -nostdin \ -thread_queue_size 512 \ - -i tcp://localhost:15000 \ + -i tcp://$MIXHOST:15000 \ -thread_queue_size 512 \ - -i tcp://localhost:13000 \ + -i tcp://$MIXHOST:13000 \ -threads:0 0 \ -aspect 16:9 \ -filter_complex ' |