From a92bcfe91bc274970840cbd65e1389d0c4371e02 Mon Sep 17 00:00:00 2001 From: Timmy Keller Date: Thu, 11 Nov 2021 22:23:10 -0600 Subject: tssg changes and such --- video/ffconcat | 17 +++++++++++++++++ video/slideshow | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 video/ffconcat (limited to 'video') diff --git a/video/ffconcat b/video/ffconcat new file mode 100755 index 0000000..7e903f6 --- /dev/null +++ b/video/ffconcat @@ -0,0 +1,17 @@ +#!/bin/sh +#for out; do true; done # get last argument +filelist=$(mktemp ${TMPDIR:-/tmp}/ffconcat.XXXXXX) || exit +pwd="$(pwd)" +for out; do + [ -e "$pwd/$out" ] \ + && files="$pwd/$out\n$files" \ + || ([ -e "$out" ] && files="$out\n$files") +done +echo $files | tail +2 | sed -n "s/\(.\+\)/file '\1'/p"# > $filelist + +ffmpeg \ + -f concat \ + -safe 0 \ + -i $filelist \ + -c copy \ + $out diff --git a/video/slideshow b/video/slideshow index 94c530e..d1a9647 100755 --- a/video/slideshow +++ b/video/slideshow @@ -1,5 +1,5 @@ #!/bin/sh -cat *.JPG | ffmpeg -y \ +cat "$@" | ffmpeg -y \ -framerate 0.20 -loop 1 \ -f image2pipe \ -i - \ -- cgit v1.2.3