http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58284
Revision: 58284 Author: dale Date: 2009-10-28 21:06:02 +0000 (Wed, 28 Oct 2009) Log Message: ----------- * updated local cortado applet to cortado-ovt-stripped-0.5.0.jar per http://lists.xiph.org/pipermail/theora/2009-October/002976.html * slight bugfix for getting bitrate Modified Paths: -------------- trunk/extensions/OggHandler/OggHandler.php trunk/extensions/OggHandler/OggHandler_body.php Added Paths: ----------- trunk/extensions/OggHandler/cortado-ovt-stripped-0.5.0.jar Removed Paths: ------------- trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r36976.jar trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r38710.jar trunk/extensions/OggHandler/cortado_0.2.2-89.jar Modified: trunk/extensions/OggHandler/OggHandler.php =================================================================== --- trunk/extensions/OggHandler/OggHandler.php 2009-10-28 20:59:26 UTC (rev 58283) +++ trunk/extensions/OggHandler/OggHandler.php 2009-10-28 21:06:02 UTC (rev 58284) @@ -87,4 +87,4 @@ // as the uploaded media files or Java security rules will // prevent the applet from loading them. // -$wgCortadoJarFile = "cortado_0.2.2-89.jar"; +$wgCortadoJarFile = "cortado-ovt-stripped-0.5.0.jar"; Modified: trunk/extensions/OggHandler/OggHandler_body.php =================================================================== --- trunk/extensions/OggHandler/OggHandler_body.php 2009-10-28 20:59:26 UTC (rev 58283) +++ trunk/extensions/OggHandler/OggHandler_body.php 2009-10-28 21:06:02 UTC (rev 58284) @@ -503,10 +503,10 @@ $size += $stream['size']; } } - if( $size != 0 ){ + if( isset( $unpacked['bitrate'] ) ){ + $bitrate = $unpacked['bitrate']; + }else{ $bitrate = $length == 0 ? 0 : $size / $length * 8; - }else{ - $bitrate = $unpacked['bitrate']; } return wfMsg( $msg, implode( '/', $streamTypes ), $wgLang->formatTimePeriod( $length ), Added: trunk/extensions/OggHandler/cortado-ovt-stripped-0.5.0.jar =================================================================== (Binary files differ) Property changes on: trunk/extensions/OggHandler/cortado-ovt-stripped-0.5.0.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r36976.jar =================================================================== (Binary files differ) Deleted: trunk/extensions/OggHandler/cortado-ovt-stripped-wm_r38710.jar =================================================================== (Binary files differ) Deleted: trunk/extensions/OggHandler/cortado_0.2.2-89.jar =================================================================== (Binary files differ) _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
