Merge branch 'development' into LTS_development
# Conflicts: # lib/stream.cpp # lib/stream.h # src/input/input.cpp # src/output/output_http_internal.cpp
This commit is contained in:
commit
bef46f969c
8 changed files with 74 additions and 97 deletions
|
@ -85,6 +85,7 @@ namespace Mist {
|
|||
/*LTS-end*/
|
||||
|
||||
capa["source_match"] = "push://*";
|
||||
capa["non-provider"] = true;//Indicates we don't provide data, only collect it
|
||||
capa["priority"] = 9ll;
|
||||
capa["desc"] = "Provides buffered live input";
|
||||
capa["codecs"][0u][0u].append("*");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue