Changeset 28369
- Timestamp:
- 2013-10-09T23:31:21+13:00 (10 years ago)
- Location:
- gs2-extensions/video-and-audio/trunk/src
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioConverter.pm
r26531 r28369 100 100 $result =~ s/^.*\'$audio_safe\'://s; 101 101 102 if ($result =~ m/Audio: (\w+) , (\d+) Hz, (\w+)(?:, (\d+.*))?/m) {102 if ($result =~ m/Audio: (\w+).*?, (\d+) Hz, (\w+)(?:, (\d+.*))?/m) { 103 103 $atype = $1; 104 104 $afreq = $2; -
gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioPlugin.pm
r26532 r28369 210 210 $self->init_cache_for_file($filename); 211 211 212 213 212 my $originalfilename = undef; 214 213 my $type = "unknown"; … … 235 234 236 235 $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 } 237 246 } 238 247 -
gs2-extensions/video-and-audio/trunk/src/perllib/plugins/MultimediaPlugin.pm
r26920 r28369 99 99 if (($ENV{'GSDLOS'} ne "windows" || Win32::IsWinNT())) { 100 100 101 ## my $result = `ffmpeg -h 2>&1`; 101 102 my $result = `ffmpeg -version 2>&1`; 102 103 103 if (!defined $result || $result !~ m/^FFmpeg version/im) {104 if (!defined $result || $result !~ m/^FFmpeg\s+version/mi) { 104 105 $self->{'ffmpeg_installed'} = 0; 105 106 if (defined $result) { 107 print STDERR "Problem detecting ffmpeg:\n"; 106 108 print STDERR $result; 107 109 }
Note:
See TracChangeset
for help on using the changeset viewer.