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-07-25 13:24:47 +02:00
commit cf75a2d6a2
4 changed files with 538 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/output/output_http_internal.cpp
View file

@ -2,6 +2,7 @@
#include "output_http_internal.h"
#include <mist/stream.h>
#include <mist/encode.h>
#include <mist/langcodes.h>
#include "flashPlayer.h"
#include "oldFlashPlayer.h"
@ -413,6 +414,9 @@ namespace Mist {
// show ALL the meta datas!
json_resp["meta"] = strm.asJSON();
jsonForEach(json_resp["meta"]["tracks"], it) {
if (it->isMember("lang")){
(*it)["language"] = Encodings::ISO639::decode((*it)["lang"].asStringRef());
}
it->removeMember("fragments");
it->removeMember("keys");
it->removeMember("keysizes");