Changeset 28369 for gs2-extensions

Show
Ignore:
Timestamp:
09.10.2013 23:31:21 (6 years ago)
Author:
davidb
Message:

Changes to work with newer version of ffmpeg

Location:
gs2-extensions/video-and-audio/trunk/src
Files:
1 added
3 modified

Legend:

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

    r26531 r28369  
    100100    $result =~ s/^.*\'$audio_safe\'://s; 
    101101 
    102     if ($result =~ m/Audio: (\w+), (\d+) Hz, (\w+)(?:, (\d+.*))?/m) { 
     102    if ($result =~ m/Audio: (\w+).*?, (\d+) Hz, (\w+)(?:, (\d+.*))?/m) { 
    103103    $atype = $1; 
    104104    $afreq = $2; 
  • gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioPlugin.pm

    r26532 r28369  
    210210    $self->init_cache_for_file($filename); 
    211211 
    212  
    213212    my $originalfilename = undef; 
    214213    my $type = "unknown"; 
     
    235234                             
    236235    $type = $converttotype; 
     236    $filename = $ofilename; 
     237    $file = $ofile; 
     238 
     239    ($aduration,$asize,$atype,$afreq,$achan,$arate)  
     240        = &AudioConverter::identify($ofilename, $outhandle, $verbosity); 
     241 
     242    if ($aduration eq "N/A") { 
     243        print $outhandle "Unable to determine duration of converted $ofile\n"; 
     244        $aduration = undef; 
     245    } 
    237246    } 
    238247     
  • gs2-extensions/video-and-audio/trunk/src/perllib/plugins/MultimediaPlugin.pm

    r26920 r28369  
    9999    if (($ENV{'GSDLOS'} ne "windows" || Win32::IsWinNT())) { 
    100100 
     101##  my $result = `ffmpeg -h 2>&1`; 
    101102    my $result = `ffmpeg -version 2>&1`; 
    102103 
    103     if (!defined $result || $result !~ m/^FFmpeg version/im) { 
     104    if (!defined $result || $result !~ m/^FFmpeg\s+version/mi) { 
    104105        $self->{'ffmpeg_installed'} = 0; 
    105106        if (defined $result) { 
     107        print STDERR "Problem detecting ffmpeg:\n"; 
    106108        print STDERR $result; 
    107109        }