diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN acidrip-0.14.orig/AcidRip/acidrip.pm acidrip-0.14/AcidRip/acidrip.pm --- acidrip-0.14.orig/AcidRip/acidrip.pm 2004-07-25 10:03:09.000000000 -0400 +++ acidrip-0.14/AcidRip/acidrip.pm 2007-02-22 10:50:12.000000000 -0500 @@ -321,7 +321,7 @@ sub get_parameters { } my $frames = $::settings->{'ppc_bug'} ? 100 : 10; - my $sstep = "-sstep " . int $length / ( 3 * $frames ) + 1; + my $sstep = "-sstep 61"; $sstep = "-ss " . int $length / 3 if $::settings->{'ppc_bug'}; $menc{'frames'} = "-frames $frames $sstep"; @@ -680,7 +680,7 @@ sub find_crop ($) { message( "Running " . get_command("cropdetect") ); open( CROP, get_command("cropdetect") . " 2>&1 |" ); while () { - if ( $_ =~ /crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ } + if ( $_ =~ /Crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ } $crop_output .= $_; gui_check($_); } @@ -863,7 +863,7 @@ sub encode { if ( $::settings->{'mencoder_pid'} = open( MENCODER, "$menc 2>&1 |" ) ) { $/ = "\r"; while () { - if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) { + if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+.\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) { if ( $1 ne $sec ) { $sec = $1; $::widgets->{'menc_seconds'}->set_text( hhmmss($1) ) } if ( $4 ne $fps ) { $fps = $4; $::widgets->{'menc_fps'}->set_text($4) } if ( $6 ne $size ) { $size = $6; $::widgets->{'menc_filesize'}->set_text($6) }