http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84564
Revision: 84564
Author: dale
Date: 2011-03-22 21:42:15 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
fixed case for wgFFmpeg2theoraLocation
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/README
trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
Modified: trunk/extensions/TimedMediaHandler/README
===================================================================
--- trunk/extensions/TimedMediaHandler/README 2011-03-22 21:39:33 UTC (rev
84563)
+++ trunk/extensions/TimedMediaHandler/README 2011-03-22 21:42:15 UTC (rev
84564)
@@ -85,7 +85,7 @@
Set the ffmpeg2theora binary location with:
- $wgffmpeg2theoraLocation = '/path/to/ffmpeg2theora';
+ $wgFFmpeg2theoraLocation = '/path/to/ffmpeg2theora';
Download ffmpeg2theora from: http://firefogg.org/nightly/
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-03-22
21:39:33 UTC (rev 84563)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.php 2011-03-22
21:42:15 UTC (rev 84564)
@@ -45,7 +45,7 @@
$wgOggThumbLocation = '/usr/bin/oggThumb';
// The location of ffmpeg2theora ( transcoding )
-$wgffmpeg2theoraLocation = '/usr/bin/ffmpeg2theora';
+$wgFFmpeg2theoraLocation = '/usr/bin/ffmpeg2theora';
// Location of the FFmpeg binary ( used to encode WebM and for thumbnails )
$wgFFmpegLocation = '/usr/bin/ffmpeg';
Modified:
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
===================================================================
---
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
2011-03-22 21:39:33 UTC (rev 84563)
+++
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php
2011-03-22 21:42:15 UTC (rev 84564)
@@ -288,13 +288,13 @@
* ffmpeg2Theora mapping is much simpler since it is the basis of the
the firefogg API
*/
function ffmpeg2TheoraEncode( $file, $target, $options){
- global $wgffmpeg2theoraLocation;
+ global $wgFFmpeg2theoraLocation;
// Get the source:
$source = $file->getFullPath();
// Set up the base command
- $cmd = wfEscapeShellArg( $wgffmpeg2theoraLocation ) . ' ' .
wfEscapeShellArg( $source );
+ $cmd = wfEscapeShellArg( $wgFFmpeg2theoraLocation ) . ' ' .
wfEscapeShellArg( $source );
// Add in the encode settings
foreach( $options as $key => $val ){
if( isset( self::$foggMap[$key] ) ){
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
