summaryrefslogtreecommitdiff
path: root/bin/decode+edit+encode
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-16 13:35:22 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-16 15:41:43 +0200
commit3fac3065c98c26e97c21d3b4f22819a2cdcf8c38 (patch)
tree24b7dada358309e1649aed3bbe29cb1f2589c387 /bin/decode+edit+encode
parent46ddda9c56187f452b258e45520db0971dd470b4 (diff)
Drop loop: Bogusly treats audio track in main input as video track.
Diffstat (limited to 'bin/decode+edit+encode')
-rwxr-xr-xbin/decode+edit+encode5
1 files changed, 1 insertions, 4 deletions
diff --git a/bin/decode+edit+encode b/bin/decode+edit+encode
index 72ef4cd..79a74d5 100755
--- a/bin/decode+edit+encode
+++ b/bin/decode+edit+encode
@@ -2,8 +2,6 @@
set -e
-ITERATIONS=${1-1} # no looping by default
-
HEIGHT=360
VBITRATE=500000
@@ -15,10 +13,9 @@ TMPMOVIE=../tmp/omni/show0/earth.webm
mkdir -p $(dirname "$TMPMOVIE")
# based on http://www.webmproject.org/docs/encoder-parameters/#real-time-cbr-encoding-and-streaming
-# + loop-in-filter trick based on http://video.stackexchange.com/a/16933
# + scale+watermark trick based on http://stackoverflow.com/a/10937357
ffmpeg -threads auto -y -re \
- -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB)" \
+ -i "$MOVIE" \
-i "$LOGO" \
-filter_complex \
"[0:v]scale=-1:$HEIGHT[bg];