From bebb122c76dac7fad64dd0b1be569c92f6a63672 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Fri, 6 May 2016 19:13:02 +0200 Subject: merge changes from voc deployment back --- example-scripts/ffmpeg/source-mjpg-framegrabber.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'example-scripts') diff --git a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh index f765f54..babde08 100755 --- a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh +++ b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh @@ -1,7 +1,7 @@ #!/bin/sh . `dirname "$0"`/../config.sh -ffmpeg -y -nostdin \ - -i "http://10.73.5.2:1881/stream.mjpg" \ +ffmpeg -y -nostdin -xerror \ + -timeout 3000000 -i "http://10.73.5.2:1881/stream.mjpg" \ -filter_complex " [0:v] scale=$WIDTH:$HEIGHT,fps=$FRAMERATE [v] ; anullsrc=r=$AUDIORATE:cl=stereo [a] -- cgit v1.2.3