 |
tMerge branch 'master' of src.adamsgaard.dk:bitreich-memestats - bitreich-memes… |
 |
git clone git://src.adamsgaard.dk/bitreich-memestats |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 571875b9ff96ece4781f2eea2a89d89c6119655f |
|
parent f80a953430c2244a2c307a6424d1921ad9509644 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Tue, 21 Apr 2020 22:58:40 +0200 |
|
|
|
Merge branch 'master' of src.adamsgaard.dk:bitreich-memestats |
|
|
|
Diffstat: |
|
M brtv-start.sh | 14 +++++++------- |
|
|
|
1 file changed, 7 insertions(+), 7 deletions(-) |
|
--- |
|
diff --git a/brtv-start.sh b/brtv-start.sh |
|
t@@ -56,20 +56,20 @@ video_from_img() { |
|
-i "$1" \ |
|
-t "00:${3}:00" \ |
|
$ffmpeg_codec \ |
|
- "$2" |
|
+ "$2"; |
|
} |
|
|
|
title_slide() { |
|
- img="$(basename "${1%.*}.png)" |
|
- convert -size 640x480 xc:"$bgcolor" -pointsize 48 -fill "$fgcolor" \ |
|
- -gravity center -draw "text 0,0 '#${1%.*}'" "$t" |
|
+ img="$(basename "${1%.*}".png)" |
|
+ convert -size "$video_resolution" "xc:${bgcolor}" -pointsize 48 -fill … |
|
+ -gravity center -draw "text 0,0 '#${img%.*}'" "$img" |
|
ffmpeg -y \ |
|
-f lavfi \ |
|
-i anullsrc=r=48000 \ |
|
- -i "$t" \ |
|
+ -i "$img" \ |
|
-t "00:${title_display_time}:00" \ |
|
- $ffmpec_codec\ |
|
- "$2" |
|
+ $ffmpec_codec \ |
|
+ "$2"; |
|
} |
|
|
|
video_conv() { |
