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 branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-27 13:25:42 -04:00
commit 9933cbf2bd
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -950,16 +950,15 @@
if (mediaSource.TranscodingSubProtocol == 'hls') { if (mediaSource.TranscodingSubProtocol == 'hls') {
if (mediaSource.RunTimeTicks) {
// Reports of stuttering with h264 stream copy in IE // Reports of stuttering with h264 stream copy in IE
mediaUrl += '&EnableAutoStreamCopy=false'; 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;
} }