| Index: trunk/extensions/TimedMediaHandler/TimedMediaHandler.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | $wgOggThumbLocation = '/usr/bin/oggThumb'; |
| 47 | 47 | |
| 48 | 48 | // The location of ffmpeg2theora ( transcoding ) |
| 49 | | -$wgffmpeg2theoraLocation = '/usr/bin/ffmpeg2theora'; |
| | 49 | +$wgFFmpeg2theoraLocation = '/usr/bin/ffmpeg2theora'; |
| 50 | 50 | |
| 51 | 51 | // Location of the FFmpeg binary ( used to encode WebM and for thumbnails ) |
| 52 | 52 | $wgFFmpegLocation = '/usr/bin/ffmpeg'; |
| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscodeJob.php |
| — | — | @@ -288,13 +288,13 @@ |
| 289 | 289 | * ffmpeg2Theora mapping is much simpler since it is the basis of the the firefogg API |
| 290 | 290 | */ |
| 291 | 291 | function ffmpeg2TheoraEncode( $file, $target, $options){ |
| 292 | | - global $wgffmpeg2theoraLocation; |
| | 292 | + global $wgFFmpeg2theoraLocation; |
| 293 | 293 | |
| 294 | 294 | // Get the source: |
| 295 | 295 | $source = $file->getFullPath(); |
| 296 | 296 | |
| 297 | 297 | // Set up the base command |
| 298 | | - $cmd = wfEscapeShellArg( $wgffmpeg2theoraLocation ) . ' ' . wfEscapeShellArg( $source ); |
| | 298 | + $cmd = wfEscapeShellArg( $wgFFmpeg2theoraLocation ) . ' ' . wfEscapeShellArg( $source ); |
| 299 | 299 | // Add in the encode settings |
| 300 | 300 | foreach( $options as $key => $val ){ |
| 301 | 301 | if( isset( self::$foggMap[$key] ) ){ |
| Index: trunk/extensions/TimedMediaHandler/README |
| — | — | @@ -85,7 +85,7 @@ |
| 86 | 86 | |
| 87 | 87 | Set the ffmpeg2theora binary location with: |
| 88 | 88 | |
| 89 | | - $wgffmpeg2theoraLocation = '/path/to/ffmpeg2theora'; |
| | 89 | + $wgFFmpeg2theoraLocation = '/path/to/ffmpeg2theora'; |
| 90 | 90 | |
| 91 | 91 | Download ffmpeg2theora from: http://firefogg.org/nightly/ |
| 92 | 92 | |