Merge branch 'development' into LTS_development

# Conflicts:
#	src/input/input.cpp
This commit is contained in:
Thulinma 2017-08-03 15:08:48 +02:00
commit bb2e6de56a
4 changed files with 39 additions and 6 deletions

View file

@ -321,6 +321,7 @@ namespace DTSC {
std::string codec;
std::string type;
std::string lang;///< ISO 639-2 Language of track, empty or und if unknown.
uint32_t minKeepAway;///<Time in MS to never seek closer than live point to
//audio only
int rate;
int size;