diff options
| author | Timmy Keller <tjk@tjkeller.xyz> | 2021-11-11 22:23:10 -0600 |
|---|---|---|
| committer | Timmy Keller <tjk@tjkeller.xyz> | 2021-11-11 22:23:10 -0600 |
| commit | a92bcfe91bc274970840cbd65e1389d0c4371e02 (patch) | |
| tree | b0d507fc9bee430cb429d32e796201773c8599d3 /video | |
| parent | 73688982c135a0276a64aec7d61aaff4e9434d09 (diff) | |
| download | scripts-a92bcfe91bc274970840cbd65e1389d0c4371e02.tar.xz scripts-a92bcfe91bc274970840cbd65e1389d0c4371e02.zip | |
tssg changes and such
Diffstat (limited to 'video')
| -rwxr-xr-x | video/ffconcat | 17 | ||||
| -rwxr-xr-x | video/slideshow | 2 |
2 files changed, 18 insertions, 1 deletions
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 - \ |