summaryrefslogtreecommitdiff
path: root/video
diff options
context:
space:
mode:
Diffstat (limited to 'video')
-rwxr-xr-xvideo/ffconcat17
-rwxr-xr-xvideo/slideshow2
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 - \