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_ebml.cpp
This commit is contained in:
Thulinma 2018-10-10 15:06:09 +02:00
commit a0b011325c
5 changed files with 105 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ebml.cpp
View file

@ -516,6 +516,12 @@ namespace EBML{
return std::string(strPtr, strLen);
}
std::string Element::getValStringUntrimmed() const{
uint64_t strLen = getPayloadLen();
const char * strPtr = getPayload();
return std::string(strPtr, strLen);
}
uint64_t Block::getTrackNum() const{return UniInt::readInt(getPayload());}
int16_t Block::getTimecode() const{

1
lib/ebml.h
View file

@ -97,6 +97,7 @@ namespace EBML{
int64_t getValInt() const;
double getValFloat() const;
std::string getValString() const;
std::string getValStringUntrimmed() const;
const Element findChild(uint32_t id) const;
private: