Merge branch 'development' into LTS_development
# Conflicts: # src/output/output_progressive_mp4.cpp
This commit is contained in:
commit
4bcfb5191a
9 changed files with 205 additions and 23 deletions
|
@ -325,6 +325,7 @@ namespace DTSC {
|
|||
std::string init;
|
||||
std::string codec;
|
||||
std::string type;
|
||||
std::string lang;///< ISO 639-2 Language of track, empty or und if unknown.
|
||||
//audio only
|
||||
int rate;
|
||||
int size;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue