Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
more version-string detection changes
  • Loading branch information
ex-nerd committed Apr 10, 2009
1 parent 724b5e0 commit 422ab8e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions nuvexport/export/ffmpeg.pm
Expand Up @@ -93,8 +93,8 @@ package export::ffmpeg;
push @{$self->{'errors'}}, 'Unrecognizeable ffmpeg version string.';
}
}
if ($self->{'ffmpeg_vers'} ne '0.5') {
die "This version of nuvexport requires ffmpeg 0.5.\n";
if ($self->{'ffmpeg_vers'} < 0.5) {
push @{$self->{'errors'}}, "This version of nuvexport requires ffmpeg 0.5.\n";
}
# Audio only?
$self->{'audioonly'} = $audioonly;
Expand Down
12 changes: 10 additions & 2 deletions nuvexport/export/transcode.pm
Expand Up @@ -32,8 +32,16 @@ package export::transcode;
sub init_transcode {
my $self = shift;
# Make sure we have transcode
find_program('transcode')
my $transcode = find_program('transcode')
or push @{$self->{'errors'}}, 'You need transcode to use this exporter.';
# Check the transcode version
my $data = `$transcode -version 2>&1`;
if ($data =~ m/transcode\s+v(\d+\.\d+)\b/si) {
$self->{'transcode_vers'} = $1;
}
if ($self->{'transcode_vers'} < 1.1) {
push @{$self->{'errors'}}, "This version of nuvexport requires transcode 1.1.\n";
}
}

# Load default settings
Expand Down Expand Up @@ -392,7 +400,7 @@ package export::transcode;
$str .= "See transcode warnings:\n\n$warnings";
}
else {
$str .= "Please use the --debug option to figure out what went wrong.\n"
$str .= "Please use the --debug option to figure out what went wrong.\n"
."http://www.mythtv.org/wiki/index.php/Nuvexport#Debug_Mode\n\n";
}
die $str;
Expand Down
2 changes: 1 addition & 1 deletion nuvexport/nuvexport.spec
Expand Up @@ -21,7 +21,7 @@ Requires: perl-DateManip
Requires: perl-DBD-MySQL
Requires: perl-DBI
Requires: perl-MythTV >= 0.21
Requires: transcode >= 1.0
Requires: transcode >= 1.1
Requires: ffmpeg >= 0.5
Requires: mjpegtools >= 1.6.2
Requires: mplayer
Expand Down

0 comments on commit 422ab8e

Please sign in to comment.