Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2015-09-29 14:41:26 +02:00
commit 3b92a56707
2 changed files with 22 additions and 24 deletions

View file

@ -494,10 +494,10 @@ namespace MP4 {
void setMatrix(int32_t newMatrix, size_t index);
int32_t getMatrix(size_t index);
void setWidth(uint32_t newWidth);
uint32_t getWidth();
void setHeight(uint32_t newHeight);
uint32_t getHeight();
void setWidth(double newWidth);
double getWidth();
void setHeight(double newHeight);
double getHeight();
std::string toPrettyString(uint32_t indent = 0);
protected:
void initialize();