From 63767175114636a838e0fc0d31ce0251929e45f8 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Tue, 2 Feb 2016 16:05:12 +0100 Subject: disable interaction on stdin for all ffmpeg calls --- example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh | 1 + example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh | 1 + example-scripts/ffmpeg/record-mixed-ffmpeg.sh | 1 + example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh | 2 +- example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh | 2 +- example-scripts/ffmpeg/source-decklink-cam1.sh | 2 +- example-scripts/ffmpeg/source-decklink-cam2.sh | 2 +- example-scripts/ffmpeg/source-mjpg-framegrabber.sh | 2 +- example-scripts/ffmpeg/source-nostream-music.sh | 2 +- example-scripts/ffmpeg/source-testvideo-as-cam1.sh | 2 +- example-scripts/ffmpeg/source-testvideo-as-cam2.sh | 2 +- example-scripts/ffmpeg/stream-hd.sh | 2 +- example-scripts/ffmpeg/stream-sd.sh | 2 +- 13 files changed, 13 insertions(+), 10 deletions(-) diff --git a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh index f987c97..48d8d1f 100755 --- a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh +++ b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh @@ -5,6 +5,7 @@ # you do not have such a FFmpeg version. ffmpeg \ + -y -nostdin \ -i tcp://localhost:11000 \ -ac 2 -channel_layout 2 -aspect 16:9 \ -map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv422p -qscale:v:0 2 -qmin:v:0 2 -qmax:v:0 7 -keyint_min 0 -bf:0 0 -g:0 0 -intra:0 -maxrate:0 90M \ diff --git a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh index 0ea3d25..341aa27 100755 --- a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh +++ b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh @@ -1,5 +1,6 @@ #!/bin/sh ffmpeg \ + -y -nostdin \ -i tcp://localhost:11000 \ -ac 2 -channel_layout 2 -aspect 16:9 \ -map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv422p -qscale:v:0 2 -qmin:v:0 2 -qmax:v:0 7 -keyint_min 0 -bf:0 0 -g:0 0 -intra:0 -maxrate:0 90M \ diff --git a/example-scripts/ffmpeg/record-mixed-ffmpeg.sh b/example-scripts/ffmpeg/record-mixed-ffmpeg.sh index fb3a03a..c9b583e 100755 --- a/example-scripts/ffmpeg/record-mixed-ffmpeg.sh +++ b/example-scripts/ffmpeg/record-mixed-ffmpeg.sh @@ -1,5 +1,6 @@ #!/bin/sh ffmpeg \ + -y -nostdin \ -i tcp://localhost:11000 \ -ac 2 -channel_layout 2 -aspect 16:9 \ -map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv422p -qscale:v:0 2 -qmin:v:0 2 -qmax:v:0 7 -keyint_min 0 -bf:0 0 -g:0 0 -intra:0 -maxrate:0 90M \ diff --git a/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh b/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh index fd55f05..10f8486 100755 --- a/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh +++ b/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh @@ -1,6 +1,6 @@ #!/bin/sh . `dirname "$0"`/../config.sh -ffmpeg -y \ +ffmpeg -y -nostdin \ -i http://c3voc.mazdermind.de/testfiles/avsync.ts \ -filter_complex " [0:v] scale=$WIDTH:$HEIGHT,fps=$FRAMERATE [v] ; diff --git a/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh b/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh index 4de3f83..e9ea13e 100755 --- a/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh +++ b/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh @@ -1,7 +1,7 @@ #!/bin/sh . `dirname "$0"`/../config.sh wget -nc -O /tmp/avsync.ts http://c3voc.mazdermind.de/testfiles/avsync.ts -(while true; do cat /tmp/avsync.ts || exit; done) | ffmpeg -y \ +(while true; do cat /tmp/avsync.ts || exit; done) | ffmpeg -y -nostdin \ -i - \ -filter_complex " [0:v] scale=$WIDTH:$HEIGHT,fps=$FRAMERATE [v] ; diff --git a/example-scripts/ffmpeg/source-decklink-cam1.sh b/example-scripts/ffmpeg/source-decklink-cam1.sh index e10a9b2..42b96af 100755 --- a/example-scripts/ffmpeg/source-decklink-cam1.sh +++ b/example-scripts/ffmpeg/source-decklink-cam1.sh @@ -1,5 +1,5 @@ #!/bin/sh -ffmpeg -y \ +ffmpeg -y -nostdin \ -f decklink \ -i 'DeckLink Mini Recorder (1)@10' \ -c:v rawvideo -c:a pcm_s16le \ diff --git a/example-scripts/ffmpeg/source-decklink-cam2.sh b/example-scripts/ffmpeg/source-decklink-cam2.sh index 9db4494..baee933 100755 --- a/example-scripts/ffmpeg/source-decklink-cam2.sh +++ b/example-scripts/ffmpeg/source-decklink-cam2.sh @@ -1,5 +1,5 @@ #!/bin/sh -ffmpeg -y \ +ffmpeg -y -nostdin \ -f decklink \ -i 'DeckLink Mini Recorder (2)@10' \ -c:v rawvideo -c:a pcm_s16le \ diff --git a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh index c470a91..f765f54 100755 --- a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh +++ b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh @@ -1,6 +1,6 @@ #!/bin/sh . `dirname "$0"`/../config.sh -ffmpeg -y \ +ffmpeg -y -nostdin \ -i "http://10.73.5.2:1881/stream.mjpg" \ -filter_complex " [0:v] scale=$WIDTH:$HEIGHT,fps=$FRAMERATE [v] ; diff --git a/example-scripts/ffmpeg/source-nostream-music.sh b/example-scripts/ffmpeg/source-nostream-music.sh index 9a8c877..5f10caf 100755 --- a/example-scripts/ffmpeg/source-nostream-music.sh +++ b/example-scripts/ffmpeg/source-nostream-music.sh @@ -2,7 +2,7 @@ . `dirname "$0"`/../config.sh wget -nc -O /tmp/machine_lullaby_1.ogg http://c3voc.mazdermind.de/testfiles/machine_lullaby_1.ogg while true; do - ffmpeg -y \ + ffmpeg -y -nostdin \ -i "/tmp/machine_lullaby_1.ogg" \ -ac 2 \ -af aresample=$AUDIORATE \ diff --git a/example-scripts/ffmpeg/source-testvideo-as-cam1.sh b/example-scripts/ffmpeg/source-testvideo-as-cam1.sh index bd68933..452e0f3 100755 --- a/example-scripts/ffmpeg/source-testvideo-as-cam1.sh +++ b/example-scripts/ffmpeg/source-testvideo-as-cam1.sh @@ -1,6 +1,6 @@ #!/bin/sh . `dirname "$0"`/../config.sh -ffmpeg -y \ +ffmpeg -y -nostdin \ -i "http://ftp.uni-erlangen.de/cdn.media.ccc.de/broadcast/sendezentrum/h264-hd/31c3-sendezentrum-1013-de-Methodisch_inkorrekt_Die_falsche_42_hd.mp4" \ -ac 2 \ -filter_complex " diff --git a/example-scripts/ffmpeg/source-testvideo-as-cam2.sh b/example-scripts/ffmpeg/source-testvideo-as-cam2.sh index 1c72485..674f6c7 100755 --- a/example-scripts/ffmpeg/source-testvideo-as-cam2.sh +++ b/example-scripts/ffmpeg/source-testvideo-as-cam2.sh @@ -1,6 +1,6 @@ #!/bin/sh . `dirname "$0"`/../config.sh -ffmpeg -y \ +ffmpeg -y -nostdin \ -i "http://ftp.uni-erlangen.de/cdn.media.ccc.de/broadcast/sendezentrum/h264-hd/31c3-sendezentrum-1003-de-Freak_Show_FS147_That_Escalatored_Quickly_hd.mp4" \ -ac 2 \ -filter_complex " diff --git a/example-scripts/ffmpeg/stream-hd.sh b/example-scripts/ffmpeg/stream-hd.sh index d2f2375..b0c0e07 100755 --- a/example-scripts/ffmpeg/stream-hd.sh +++ b/example-scripts/ffmpeg/stream-hd.sh @@ -1,6 +1,6 @@ #!/bin/sh wget -nc -O /tmp/overlay_hd.png http://c3voc.mazdermind.de/testfiles/overlay_hd.png -ffmpeg -y \ +ffmpeg -y -nostdin \ -i tcp://localhost:15000 \ -threads:0 0 \ -aspect 16:9 \ diff --git a/example-scripts/ffmpeg/stream-sd.sh b/example-scripts/ffmpeg/stream-sd.sh index e5a0106..26a7cfb 100755 --- a/example-scripts/ffmpeg/stream-sd.sh +++ b/example-scripts/ffmpeg/stream-sd.sh @@ -1,6 +1,6 @@ #!/bin/sh wget -nc -O /tmp/overlay_hd.png http://c3voc.mazdermind.de/testfiles/overlay_hd.png -ffmpeg -y \ +ffmpeg -y -nostdin \ -i tcp://localhost:11000 \ -threads:0 0 \ -aspect 16:9 \ -- cgit v1.2.3