Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes

351-Rebase Attempt for ffmpeg stability fixes
ZoneMinder · Nov 13, 2014 · a00f719 · a00f719
2 parents 9c30b80 + 6cb96f1
commit a00f719
Show file tree

Hide file tree

Showing 3 changed files with 269 additions and 109 deletions.
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -442,6 +442,15 @@ our @options =
 		type => $types{string},
 		category => "images",
 	},
+	{
+		name => "ZM_FFMPEG_OPEN_TIMEOUT",
+		default => "10",
+		description => "Timeout in seconds when opening a stream.",
+		help => "When Ffmpeg is opening a stream, it can take a long time before failing; certain circumstances even seem to be able to lock indefinitely. This option allows you to set a maximum time in seconds to pass before closing the stream and trying to reopen it again.",
+		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
+		type => $types{integer},
+		category => "images",
+	},
 	{
 		name => "ZM_LOG_LEVEL_SYSLOG",
 		default => "0",