hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2016-10-11 11:15:53 +02:00
commit 52deec52c3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embed/wrappers/flash_strobe.js
View file

@ -1,6 +1,6 @@
mistplayers.flash_strobe = { mistplayers.flash_strobe = {
name: 'Strobe Flash Media Playback', name: 'Strobe Flash Media Playback',
mimes: ['flash/11','flash/10','flash/7'], mimes: ['flash/10','flash/11','flash/7'],
priority: Object.keys(mistplayers).length + 1, priority: Object.keys(mistplayers).length + 1,
isMimeSupported: function (mimetype) { isMimeSupported: function (mimetype) {
return (this.mimes.indexOf(mimetype) == -1 ? false : true); return (this.mimes.indexOf(mimetype) == -1 ? false : true);

3
src/output/output_hds.cpp
View file

@ -117,7 +117,8 @@ namespace Mist {
"</bootstrapInfo>" << std::endl; "</bootstrapInfo>" << std::endl;
Result << " <media " Result << " <media "
"url=\"" << (*it) << "-\" " "url=\"" << (*it) << "-\" "
"bitrate=\"" << myMeta.tracks[(*it)].bps * 8 << "\" " //bitrate in kbit/s, we have bps so divide by 128
"bitrate=\"" << (myMeta.tracks[(*it)].bps / 128) << "\" "
"bootstrapInfoId=\"boot" << (*it) << "\" " "bootstrapInfoId=\"boot" << (*it) << "\" "
"width=\"" << myMeta.tracks[(*it)].width << "\" " "width=\"" << myMeta.tracks[(*it)].width << "\" "
"height=\"" << myMeta.tracks[(*it)].height << "\">" << std::endl; "height=\"" << myMeta.tracks[(*it)].height << "\">" << std::endl;