mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #1226 from MediaBrowser/master

Browse source 
Merge from master
This commit is contained in:
Luke 2015-10-27 13:27:11 -04:00
commit 783931c235
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/mediaplayer.js
View file

@ -950,16 +950,15 @@
if (mediaSource.TranscodingSubProtocol == 'hls') { if (mediaSource.TranscodingSubProtocol == 'hls') {
// Reports of stuttering with h264 stream copy in IE if (mediaSource.RunTimeTicks) {
mediaUrl += '&EnableAutoStreamCopy=false'; // Reports of stuttering with h264 stream copy in IE
mediaUrl += '&EnableAutoStreamCopy=false';
}
mediaUrl += seekParam; mediaUrl += seekParam;
contentType = 'application/x-mpegURL'; contentType = 'application/x-mpegURL';
} else { } else {
// Reports of stuttering with h264 stream copy in IE
mediaUrl += '&EnableAutoStreamCopy=false';
startTimeTicksOffset = startPosition || 0; startTimeTicksOffset = startPosition || 0;
contentType = 'video/' + mediaSource.TranscodingContainer; contentType = 'video/' + mediaSource.TranscodingContainer;
} }

2
dashboard-ui/scripts/notifications.js
View file

@ -132,7 +132,7 @@
if (notification.Level == "Error") { if (notification.Level == "Error") {
itemHtml += '<paper-fab mini class="" style="background:#cc3333;" icon="error" item-icon></paper-fab>'; itemHtml += '<paper-fab mini class="" style="background:#cc3333;" icon="error" item-icon></paper-fab>';
} else { } else {
itemHtml += '<paper-fabmini class="blue" icon="dvr" item-icon></paper-fab>'; itemHtml += '<paper-fab mini class="blue" icon="dvr" item-icon></paper-fab>';
} }
itemHtml += '<paper-item-body three-line>'; itemHtml += '<paper-item-body three-line>';