yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1167 from Niols/develop

Browse source 
Fix issue that blocks webplayer when transcoding
This commit is contained in:
Afterster 2016-03-06 22:45:43 +01:00
commit ed7da4c264
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/class/webplayer.class.php
View file

@ -102,7 +102,7 @@ class WebPlayer
// Transcode is not forced, transcode only if required
if (!$transcode) {
if (!in_array('native', $valid_types)) {
if ($transcode_cfg == 'always' || !in_array('native', $valid_types)) {
$transcode_settings = $media->get_transcode_settings(null, 'webplayer');
if ($transcode_settings) {
$types['real'] = $transcode_settings['format'];