From 737638d950e6db1049617b1f80ac5d812bcbe455 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Mon, 7 Nov 2016 10:00:51 +0800 Subject: [PATCH] MDL-38158 media: mpeg is not html5 supported format --- lib/classes/filetypes.php | 6 +++--- lib/classes/useragent.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/classes/filetypes.php b/lib/classes/filetypes.php index 28ffaf5de19..e638d9e53db 100644 --- a/lib/classes/filetypes.php +++ b/lib/classes/filetypes.php @@ -153,11 +153,11 @@ abstract class core_filetypes { 'string' => 'video'), 'm4a' => array('type' => 'audio/mp4', 'icon' => 'mp3', 'groups' => array('audio', 'html_audio', 'web_audio'), 'string' => 'audio'), - 'mpeg' => array('type' => 'video/mpeg', 'icon' => 'mpeg', 'groups' => array('html_video', 'video', 'web_video'), + 'mpeg' => array('type' => 'video/mpeg', 'icon' => 'mpeg', 'groups' => array('video', 'web_video'), 'string' => 'video'), - 'mpe' => array('type' => 'video/mpeg', 'icon' => 'mpeg', 'groups' => array('html_video', 'video', 'web_video'), + 'mpe' => array('type' => 'video/mpeg', 'icon' => 'mpeg', 'groups' => array('video', 'web_video'), 'string' => 'video'), - 'mpg' => array('type' => 'video/mpeg', 'icon' => 'mpeg', 'groups' => array('html_video', 'video', 'web_video'), + 'mpg' => array('type' => 'video/mpeg', 'icon' => 'mpeg', 'groups' => array('video', 'web_video'), 'string' => 'video'), 'mpr' => array('type' => 'application/vnd.moodle.profiling', 'icon' => 'moodle'), diff --git a/lib/classes/useragent.php b/lib/classes/useragent.php index 8fb7a7cfc59..1e6cd3a55d5 100644 --- a/lib/classes/useragent.php +++ b/lib/classes/useragent.php @@ -1083,8 +1083,8 @@ class core_useragent { public static function supports_html5($extension) { $extension = strtolower($extension); - $supportedvideo = array('m4v', 'webm', 'ogv', 'mp4'); - $supportedaudio = array('ogg', 'oga', 'aac', 'm4a', 'mp3', 'wav', 'mov'); + $supportedvideo = array('m4v', 'webm', 'ogv', 'mp4', 'mov'); + $supportedaudio = array('ogg', 'oga', 'aac', 'm4a', 'mp3', 'wav'); // TODO MDL-56549 Flac will be supported in Firefox 51 in January 2017. // Basic extension support. -- 2.11.4.GIT