aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind <git@mazdermind.de>2016-05-06 19:13:02 +0200
committerMaZderMind <git@mazdermind.de>2016-05-06 19:13:02 +0200
commitbebb122c76dac7fad64dd0b1be569c92f6a63672 (patch)
tree9e94677a0681d12728b4fcd3bd2b852f2ce0b7c6
parente4f1940dc0e5686ff9cdd07fb6842f91657bee3d (diff)
merge changes from voc deployment back
-rwxr-xr-xexample-scripts/ffmpeg/source-mjpg-framegrabber.sh4
1 files changed, 2 insertions, 2 deletions
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]