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.cpp
#	src/output/output_http_internal.cpp
This commit is contained in:
Thulinma 2017-01-10 12:36:53 +01:00
commit dadb1ebde8
9 changed files with 190 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/mp4_generic.h
View file

@ -783,14 +783,14 @@ namespace MP4 {
ELST();
void setCount(uint32_t newVal);
uint32_t getCount();
void setSegmentDuration(uint64_t newVal);
uint64_t getSegmentDuration();
void setMediaTime(uint64_t newVal);
uint64_t getMediaTime();
void setMediaRateInteger(uint16_t newVal);
uint16_t getMediaRateInteger();
void setMediaRateFraction(uint16_t newVal);
uint16_t getMediaRateFraction();
void setSegmentDuration(uint32_t cnt, uint64_t newVal);
uint64_t getSegmentDuration(uint32_t cnt);
void setMediaTime(uint32_t cnt, uint64_t newVal);
uint64_t getMediaTime(uint32_t cnt);
void setMediaRateInteger(uint32_t cnt, uint16_t newVal);
uint16_t getMediaRateInteger(uint32_t cnt);
void setMediaRateFraction(uint32_t cnt, uint16_t newVal);
uint16_t getMediaRateFraction(uint32_t cnt);
std::string toPrettyString(uint32_t indent = 0);
};
}