Merge branch 'development' into LTS_development

embed/wrappers/flash_strobe.js

@@ -1,6 +1,6 @@
 mistplayers.flash_strobe = {
   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,
   isMimeSupported: function (mimetype) {
     return (this.mimes.indexOf(mimetype) == -1 ? false : true);

src/output/output_hds.cpp

@@ -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;