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 2016-07-18 10:43:38 +02:00
commit 4bcfb5191a
9 changed files with 205 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/mp4_generic.h
View file

@ -515,9 +515,10 @@ namespace MP4 {
uint32_t getTimeScale();
void setDuration(uint64_t newDuration);
uint64_t getDuration();
///\todo return language properly
void setLanguage(uint16_t newLanguage);
uint16_t getLanguage();
uint16_t getLanguageInt();
void setLanguage(const std::string & newLanguage);
std::string getLanguage();
std::string toPrettyString(uint32_t indent = 0);
};