From 1d2dbd1be0536aeab01612d1843bdc22e117a547 Mon Sep 17 00:00:00 2001 From: Balder Date: Mon, 10 Oct 2016 16:29:21 +0200 Subject: [PATCH 1/2] Fixed flash priorities for embed. RTMP > FLV > HDS --- embed/wrappers/flash_strobe.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embed/wrappers/flash_strobe.js b/embed/wrappers/flash_strobe.js index 313617a0..9566d79e 100644 --- a/embed/wrappers/flash_strobe.js +++ b/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); From 25a60e4ca3dc5987d51f1e1f26aac5eb0e921cd8 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 11 Oct 2016 11:15:35 +0200 Subject: [PATCH 2/2] Fixed HDS bit rate --- src/output/output_hds.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp index 9d3c18b3..66377080 100644 --- a/src/output/output_hds.cpp +++ b/src/output/output_hds.cpp @@ -117,7 +117,8 @@ namespace Mist { "" << std::endl; Result << " " << std::endl;