Skip to content

Commit 56c6485

Browse files
committed
fix for atrpms ffmpeg version string. closes #2991
1 parent 6b37b27 commit 56c6485

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

nuvexport/export/ffmpeg.pm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@ package export::ffmpeg;
7070
# Check the ffmpeg version
7171
if (!defined $self->{'ffmpeg_vers'}) {
7272
$data = `$ffmpeg -version 2>&1`;
73-
if ($data =~ m/ffmpeg\sversion\s(.+?),(?:\sbuild\s(\d+))?/si) {
73+
if ($data =~ m/ffmpeg\version\s0.4.9-\d+_r(\d+)\.\w+\.at/si) {
74+
$self->{'ffmpeg_vers'} = 'svn';
75+
$self->{'ffmpeg_build'} = $1;
76+
}
77+
elsif ($data =~ m/ffmpeg\sversion\s(.+?),(?:\sbuild\s(\d+))?/si) {
7478
$self->{'ffmpeg_vers'} = lc($1);
7579
$self->{'ffmpeg_build'} = $2;
7680
if ($self->{'ffmpeg_vers'} =~ /^svn-r(.+?)$/) {

0 commit comments

Comments
 (0)