diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-04-16 15:41:15 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-04-16 15:41:45 +0200 |
| commit | 45d8b559bccbde5cde1b325faba6177b9b6c6558 (patch) | |
| tree | 3eb7fb5c91abdefc70d7c6e17748041f32a99d4d /bin/decode+edit | |
| parent | 80b59372497e0d43294e388155d2938e48a3084e (diff) | |
Relabel input/logo/output, and list at top.
Diffstat (limited to 'bin/decode+edit')
| -rwxr-xr-x | bin/decode+edit | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/decode+edit b/bin/decode+edit index ed4ac8b..9a96210 100755 --- a/bin/decode+edit +++ b/bin/decode+edit @@ -4,18 +4,17 @@ set -e -HEIGHT=360 - -MOVIE=../src/omni/show0/earth.mp4 +INPUT=../src/omni/show0/earth.mp4 LOGO=../../content/icon_small.png +OUTPUT=../tmp/omni/show0/earth.yuv -TMPMOVIE=../tmp/omni/show0/earth.yuv +HEIGHT=360 -mkdir -p $(dirname "$TMPMOVIE") +mkdir -p $(dirname "$OUTPUT") # + loop-in-filter trick based on http://video.stackexchange.com/a/16933 ffmpeg -threads auto -y \ - -i "$MOVIE" \ + -i "$INPUT" \ -i "$LOGO" -filter_complex 'overlay=main_w-overlay_w-20:main_h-overlay_h-20' \ -an \ - -f yuv4mpegpipe "$TMPMOVIE" + -f yuv4mpegpipe "$OUTPUT" |