Permalink
Browse files

Merge branch 'wip-MDL-56579-master-2' of git://github.com/marinaglanc…

…y/moodle
  • Loading branch information...
dmonllao committed Jul 10, 2017
2 parents 04d1f77 + 6b7a32f commit 1d0dd2072c5d654bb2ad03bc3dd31f7ccb0a24ac
Showing with 4 additions and 4 deletions.
  1. +4 −4 media/player/videojs/settings.php
@@ -26,15 +26,15 @@
if ($ADMIN->fulltree) {
$settings->add(new admin_setting_configtext('media_videojs/videoextensions',
$settings->add(new admin_setting_filetypes('media_videojs/videoextensions',
new lang_string('videoextensions', 'media_videojs'),
new lang_string('configvideoextensions', 'media_videojs'),
'.mov, .mp4, .m4v, .ogv, .webm, .flv, .f4v'));
'html_video,.f4v,.flv'));
$settings->add(new admin_setting_configtext('media_videojs/audioextensions',
$settings->add(new admin_setting_filetypes('media_videojs/audioextensions',
new lang_string('audioextensions', 'media_videojs'),
new lang_string('configaudioextensions', 'media_videojs'),
'.aac, .flac, .mp3, .m4a, .oga, .ogg, .wav'));
'html_audio'));
$settings->add(new admin_setting_configcheckbox('media_videojs/useflash',
new lang_string('useflash', 'media_videojs'),

0 comments on commit 1d0dd20

Please sign in to comment.