summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-06-08 17:08:02 +0200
committerJonas Smedegaard <dr@jones.dk>2017-06-08 17:08:02 +0200
commit39f0f0a6216e15fd9e9e97efc9bdc7ea6a94bbab (patch)
treef38f5088324ae71047764f767d853f79a3685c7d
parent07475902b85841f7dc32f3a69433cc6d54d05fbb (diff)
Fix avoid applying filter when no video.
-rwxr-xr-xbin/stream6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/stream b/bin/stream
index 614693a..154d2a5 100755
--- a/bin/stream
+++ b/bin/stream
@@ -290,10 +290,10 @@ ffmpeg -hide_banner -threads auto \
${IIDC:+-f libdc1394 -video_size 640x480 -framerate 15 -thread_queue_size 256 -i "$IIDC"} \
${VFILE:+-re${SEEK:+ -ss $SEEK} -i "$VFILE"} \
${LOGO:+-i "$LOGO"} \
- ${ENCODINGS:+-filter_complex "\
- ${HASVIDEO:+
+ ${HASVIDEO:+\
+ ${ENCODINGS:+-filter_complex "\
$(filters_compose "${LOGO:+$((VSTREAMINDEX+1))}");
- $(filter_split_codec "$ENCODINGS_WEBM" "$ENCODINGS_MPEG") }"} \
+ $(filter_split_codec "$ENCODINGS_WEBM" "$ENCODINGS_MPEG") "}} \
${SAVEDIR:+\
${DVCAM:+-map $((0${ALSA:++1})) -shortest \
-codec copy -f dv "$SAVESTEM.dv" }} \