Changeset 26921

Timestamp:

2013-02-25T13:05:04+13:00 (11 years ago)

Author:

jmt12

Message:

making ffmpeg detection tests a little more robust due to version changes

File:

• gs2-extensions/video-and-audio/trunk/src/perllib/plugins/MultimediaConverter.pm (modified) (1 diff)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/MultimediaConverter.pm

@@ -93 +93 @@
     } else {
 
-    my $result = `ffmpeg -h 2>&1`;
-
-    if (!defined $result || $result !~ m/^FFmpeg version/m) {
+    my $result = `ffmpeg -version 2>&1`;
+
+    if (!defined $result || $result !~ m/^FFmpeg version/im) {
         $self->{'ffmpeg_installed'} = 0;
         print $outhandle $result;