Changeset 26920

Show
Ignore:
Timestamp:
25.02.2013 13:04:45 (7 years ago)
Author:
jmt12
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/video-and-audio/trunk/src/perllib/plugins/MultimediaPlugin.pm

    r23292 r26920  
    9999    if (($ENV{'GSDLOS'} ne "windows" || Win32::IsWinNT())) { 
    100100 
    101     my $result = `ffmpeg -h 2>&1`; 
    102  
    103     if (!defined $result || $result !~ m/^FFmpeg version/m) { 
     101    my $result = `ffmpeg -version 2>&1`; 
     102 
     103    if (!defined $result || $result !~ m/^FFmpeg version/im) { 
    104104        $self->{'ffmpeg_installed'} = 0; 
    105105        if (defined $result) {