summaryrefslogtreecommitdiff
path: root/bin/decode+edit
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-13 09:53:35 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-13 09:53:35 +0200
commit7fda1a3bd2a78dab92dfb6fdef9094b14aa16243 (patch)
tree1c0e9bf31bb43fcfda106b953fa00e24e8545bfb /bin/decode+edit
parenta00babb88ffab4edcd459cf21b99dbe716f724a1 (diff)
Set HEIGHT (ont SIZE).
Diffstat (limited to 'bin/decode+edit')
-rwxr-xr-xbin/decode+edit4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/decode+edit b/bin/decode+edit
index 3413e01..6061d6b 100755
--- a/bin/decode+edit
+++ b/bin/decode+edit
@@ -4,7 +4,7 @@ set -e
ITERATIONS=${1-1}
-SIZE=640x360
+HEIGHT=360
MOVIE=../src/omni/show0/earth.mp4
LOGO=../../content/icon_small.png
@@ -15,6 +15,6 @@ mkdir -p $(dirname "$TMPMOVIE")
# based on http://video.stackexchange.com/a/16933
ffmpeg -threads auto -y \
- -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB), scale=$SIZE" \
+ -f lavfi -i "movie=filename=$MOVIE:loop=$ITERATIONS, setpts=N/(FRAME_RATE*TB), scale=-1:$HEIGHT" \
-i "$LOGO" -filter_complex 'overlay=main_w-overlay_w-20:main_h-overlay_h-20' \
-an -f yuv4mpegpipe "$TMPMOVIE"