diff options
| author | MaZderMind <git@mazdermind.de> | 2016-08-05 16:32:49 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-08-05 16:32:49 +0200 |
| commit | 463ab55b178935d72442b71748786c22f1f0e027 (patch) | |
| tree | b5bb905495e6131bd64f2b4aa625f438169eeaa7 /example-scripts/ffmpeg/source-mjpg-framegrabber.sh | |
| parent | 59f0abcf365e7c80bb51912d95ccc6d262d759c8 (diff) | |
allows overriding the default-config of the example-scripts
Diffstat (limited to 'example-scripts/ffmpeg/source-mjpg-framegrabber.sh')
| -rwxr-xr-x | example-scripts/ffmpeg/source-mjpg-framegrabber.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh index 1eeaea0..e5797ad 100755 --- a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh +++ b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh @@ -1,5 +1,10 @@ #!/bin/sh -. `dirname "$0"`/../config.sh +confdir="`dirname "$0"`/../" +. $confdir/default-config.sh +if [ -f $confdir/config.sh ]; then + . $confdir/config.sh +fi + ffmpeg -y -nostdin -xerror \ -use_wallclock_as_timestamps 1 -timeout 3000000 -f mjpeg -i "http://10.73.5.2:1881/stream.mjpg" \ -filter_complex " |