diff --git a/lib/bitfields.h b/lib/bitfields.h index 6d363e2c..f8d5c0af 100644 --- a/lib/bitfields.h +++ b/lib/bitfields.h @@ -119,7 +119,7 @@ namespace Bit{ return *reinterpret_cast(&tmp); } - inline float htobf(char * p, float val){ + inline void htobf(char * p, float val){ htobl(p, *reinterpret_cast(&val)); } @@ -128,7 +128,7 @@ namespace Bit{ return *reinterpret_cast(&tmp); } - inline float htobd(char * p, double val){ + inline void htobd(char * p, double val){ htobll(p, *reinterpret_cast(&val)); } diff --git a/lib/ebml.cpp b/lib/ebml.cpp index e38ed2c2..b3cc9332 100644 --- a/lib/ebml.cpp +++ b/lib/ebml.cpp @@ -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){ diff --git a/lib/flv_tag.cpp b/lib/flv_tag.cpp index 380539c8..925330b5 100644 --- a/lib/flv_tag.cpp +++ b/lib/flv_tag.cpp @@ -91,6 +91,7 @@ bool FLV::seekToTagType(FILE * f, uint8_t t){ return false; } } + return false; } /// True if this media type requires init data.