Merge branch 'development' into LTS_development
This commit is contained in:
commit
a3de760df5
3 changed files with 5 additions and 2 deletions
|
@ -119,7 +119,7 @@ namespace Bit{
|
|||
return *reinterpret_cast<float*>(&tmp);
|
||||
}
|
||||
|
||||
inline float htobf(char * p, float val){
|
||||
inline void htobf(char * p, float val){
|
||||
htobl(p, *reinterpret_cast<unsigned long*>(&val));
|
||||
}
|
||||
|
||||
|
@ -128,7 +128,7 @@ namespace Bit{
|
|||
return *reinterpret_cast<double*>(&tmp);
|
||||
}
|
||||
|
||||
inline float htobd(char * p, double val){
|
||||
inline void htobd(char * p, double val){
|
||||
htobll(p, *reinterpret_cast<unsigned long*>(&val));
|
||||
}
|
||||
|
||||
|
|
|
@ -50,6 +50,7 @@ namespace EBML{
|
|||
case 7: return Bit::btoh56(p) & 0x1FFFFFFFFFFFFull;
|
||||
case 8: return Bit::btohll(p) & 0xFFFFFFFFFFFFFFull;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void UniInt::writeInt(char *p, const uint64_t val){
|
||||
|
@ -78,6 +79,7 @@ namespace EBML{
|
|||
case 7: return ((int64_t)readInt(p)) - 0xFFFFFFFFFFFFll;
|
||||
case 8: return ((int64_t)readInt(p)) - 0x7FFFFFFFFFFFFFll;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void UniInt::writeSInt(char *p, const int64_t sval){
|
||||
|
|
|
@ -91,6 +91,7 @@ bool FLV::seekToTagType(FILE * f, uint8_t t){
|
|||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// True if this media type requires init data.
|
||||
|
|
Loading…
Add table
Reference in a new issue