Changeset 18982 for extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm

Timestamp:

2009-04-15T17:24:24+12:00 (15 years ago)

Author:

davidb

Message:

Some mods to work with Windows version of ffmpeg

File:

• extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm (modified) (2 diffs)

extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm

@@ -95 +95 @@
     my $result = `ffmpeg -h 2>&1`;
 
-    if (!defined $result || $result !~ m/^FFmpeg version/) {
+    if (!defined $result || $result !~ m/^FFmpeg version/m) {
         $self->{'ffmpeg_installed'} = 0;
         print $outhandle $result;
@@ -223 +223 @@
 
     my $gsdlhome = $ENV{'GSDLHOME'};
+    $gsdlhome = &util::filename_to_regex($gsdlhome);
+
     my $filename_gsdlenv = $filename;
     $filename_gsdlenv =~ s@^$gsdlhome@\$GSDLHOME@;