mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-38158 media: mpeg is not html5 supported format

Browse Source
This commit is contained in:
Marina Glancy 2016-11-07 10:00:51 +08:00
parent 235a80b2d5
commit 737638d950
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/filetypes.php
View File

@ -153,11 +153,11 @@ abstract class core_filetypes {
'string' => 'video'), 'string' => 'video'),
'm4a' => array('type' => 'audio/mp4', 'icon' => 'mp3', 'groups' => array('audio', 'html_audio', 'web_audio'), 'm4a' => array('type' => 'audio/mp4', 'icon' => 'mp3', 'groups' => array('audio', 'html_audio', 'web_audio'),
'string' => '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'), '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'), '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'), 'string' => 'video'),
'mpr' => array('type' => 'application/vnd.moodle.profiling', 'icon' => 'moodle'), 'mpr' => array('type' => 'application/vnd.moodle.profiling', 'icon' => 'moodle'),

4
lib/classes/useragent.php
View File

@ -1083,8 +1083,8 @@ class core_useragent {
public static function supports_html5($extension) { public static function supports_html5($extension) {
$extension = strtolower($extension); $extension = strtolower($extension);
$supportedvideo = array('m4v', 'webm', 'ogv', 'mp4'); $supportedvideo = array('m4v', 'webm', 'ogv', 'mp4', 'mov');
$supportedaudio = array('ogg', 'oga', 'aac', 'm4a', 'mp3', 'wav', 'mov'); $supportedaudio = array('ogg', 'oga', 'aac', 'm4a', 'mp3', 'wav');
// TODO MDL-56549 Flac will be supported in Firefox 51 in January 2017. // TODO MDL-56549 Flac will be supported in Firefox 51 in January 2017.
// Basic extension support. // Basic extension support.