https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110117
Revision: 110117
Author: j
Date: 2012-01-27 12:22:27 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
dont run pass 2 if pass 1 failed
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
Modified:
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
===================================================================
---
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
2012-01-27 12:03:37 UTC (rev 110116)
+++
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
2012-01-27 12:22:27 UTC (rev 110117)
@@ -109,7 +109,7 @@
if( isset( $options['twopass'] ) ){
// ffmpeg requires manual two pass
$status = $this->ffmpegEncode( $options, 1 );
- if( $status ){
+ if( $status && !is_string($status) ){
$status = $this->ffmpegEncode(
$options, 2 );
}
} else {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
