Merge branch 'development' into LTS_development

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

View file

@ -117,7 +117,8 @@ namespace Mist {
"</bootstrapInfo>" << std::endl;
Result << " <media "
"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) << "\" "
"width=\"" << myMeta.tracks[(*it)].width << "\" "
"height=\"" << myMeta.tracks[(*it)].height << "\">" << std::endl;