summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-04-27 17:33:18 +0200
committerJonas Smedegaard <dr@jones.dk>2017-04-27 17:33:18 +0200
commit943f0e2f7dcdaccbbfc1a07b4218f97e85d70914 (patch)
treeec8766c4a6fbe08c6bc74ba2a6f98b8d67900903 /bin
parent24f21d41f0ad8d9c6b762dd56a76b29328f65def (diff)
Fix scale before applying watermark.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/decode+edit5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/decode+edit b/bin/decode+edit
index 90ec5b0..f6ce75e 100755
--- a/bin/decode+edit
+++ b/bin/decode+edit
@@ -15,6 +15,9 @@ mkdir -p $(dirname "$OUTPUT")
# + loop-in-filter trick based on http://video.stackexchange.com/a/16933
ffmpeg -hide_banner -threads auto -y \
-i "$INPUT" \
- -i "$LOGO" -filter_complex 'overlay=main_w-overlay_w-20:main_h-overlay_h-20' \
+ -i "$LOGO"
+ -filter_complex \
+ "[0:v]scale=-1:$HEIGHT[bg];
+ [bg][1:v]overlay=main_w-overlay_w-20:main_h-overlay_h-20" \
-an \
-f yuv4mpegpipe "$OUTPUT"