diff options
Diffstat (limited to 'bin/decode+edit+encode')
| -rwxr-xr-x | bin/decode+edit+encode | 5 |
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]; |