From 86f562ffe4753e08b7a72b09b6ebd59375b2c9c8 Mon Sep 17 00:00:00 2001 From: stan Date: Tue, 14 Oct 2008 13:49:44 +0000 Subject: [PATCH] Added swf into allowed video formats list git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2666 e3e1d417-86f3-4887-817a-d78f3d33393f --- scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm.in index f2c8707b7..b0eb53092 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm.in @@ -454,7 +454,7 @@ our @options = }, { name => "ZM_FFMPEG_FORMATS", - default => "mpg* mpeg wmv avi mov 3gp**", + default => "mpg* mpeg wmv avi mov swf 3gp**", description => "Formats to allow for ffmpeg video generation", help => "Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a '*' after a format indicates that this will be the default format used for web video, adding '**' defines the default format for phone video.", requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],