ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added swf into allowed video formats list 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2666 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2008-10-14 13:49:44 +00:00
parent b9e39cbede
commit 86f562ffe4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm.in
View File

@ -454,7 +454,7 @@ our @options =
}, },
{ {
name => "ZM_FFMPEG_FORMATS", 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", 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.", 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" } ], requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],