jenkins-bot has submitted this change and it was merged.
Change subject: Less false positives for MEDIATYPE_VIDEO
......................................................................
Less false positives for MEDIATYPE_VIDEO
Remove the ffmpeg2theora String to suppress false positives
when doing type detection on ogg files
(Importing pull 23 from github)
Bug: 63584
Change-Id: Ib39ed06f895624b55d15a001cb0a2cd3129f4bb0
---
M includes/MimeMagic.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, but someone else must approve
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 3448c6a..f68e109 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -979,7 +979,7 @@
$head = fread( $f, 256 );
fclose( $f );
- $head = strtolower( $head );
+ $head = str_replace( 'ffmpeg2theora', '', strtolower(
$head ) );
// This is an UGLY HACK, file should be parsed correctly
if ( strpos( $head, 'theora' ) !== false ) {
--
To view, visit https://gerrit.wikimedia.org/r/130966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib39ed06f895624b55d15a001cb0a2cd3129f4bb0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Marco <mai...@live.de>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
