Fixes #12497 - fix for non-working content-size in flv streaming

Warpme · stuarta · commit d6cb44071d01 · 2016-01-06T22:50:43.000Z
Signed-off-by: Stuart Auchterlonie &lt;stuarta@squashedfrog.net&gt;
diff --git a/modules/stream/stream_flv.pl b/modules/stream/stream_flv.pl
@@ -138,7 +138,7 @@
     }
     # Guess the filesize based on duration and bitrate. This allows for progressive download behavior
     my $lengthSec;
-    $dur = `ffmpeg -i $filename 2>&1 | grep "Duration" | cut -d ' ' -f 4 | sed s/,//`;
+    $dur = `$ffmpeg -i $filename 2>&1 | grep "Duration" | cut -d ' ' -f 4 | sed s/,//`;
     if ($dur && $dur =~ /\d*:\d*:.*/) {
         @times = split(':',$dur);
         $lengthSec = $times[0]*3600+$times[1]*60+$times[2];

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@`
`138`	`138`	`}`
`139`	`139`	`# Guess the filesize based on duration and bitrate. This allows for progressive download behavior`
`140`	`140`	`my $lengthSec;`
`141`		- $dur = `ffmpeg -i $filename 2>&1 \| grep "Duration" \| cut -d ' ' -f 4 \| sed s/,//`;
	`141`	+ $dur = `$ffmpeg -i $filename 2>&1 \| grep "Duration" \| cut -d ' ' -f 4 \| sed s/,//`;
`142`	`142`	`if ($dur && $dur =~ /\d:\d:.*/) {`
`143`	`143`	`@times = split(':',$dur);`
`144`	`144`	`$lengthSec = $times[0]3600+$times[1]60+$times[2];`