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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
This commit is contained in:
Thulinma 2019-06-25 14:30:27 +02:00
commit 3c3489e7eb
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/output/output_progressive_mp4.cpp
View file

@ -32,6 +32,7 @@ namespace Mist{
capa["methods"][0u]["priority"] = 10;
//MP4 live is broken on Apple
capa["exceptions"]["live"] = JSON::fromString("[[\"blacklist\",[\"iPad\",\"iPhone\",\"iPod\",\"Safari\"]], [\"whitelist\",[\"Chrome\",\"Chromium\"]]]");
capa["exceptions"]["codec:MP3"] = JSON::fromString("[[\"blacklist\",[\"Windows NT 5\", \"Windows NT 6.0\", \"Windows NT 6.1\"]],[\"whitelist_except\",[\"Trident\"]]]");
}
uint64_t OutProgressiveMP4::estimateFileSize(){