Merge branch 'development' into LTS_development

# Conflicts:
#	src/controller/controller_statistics.cpp
#	src/input/input_buffer.cpp
#	src/input/input_dtsc.cpp
#	src/input/input_ebml.cpp
#	src/input/input_flv.cpp
#	src/input/input_mp3.cpp
#	src/output/output_httpts.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_progressive_mp4.cpp

lib/dtsc.h

@@ -334,8 +334,8 @@ namespace DTSC {
       std::string getIdentifier();
       std::string getWritableIdentifier();
       unsigned int trackID;
-      unsigned long long firstms;
-      unsigned long long lastms;
+      uint64_t firstms;
+      uint64_t lastms;
       int bps;
       int max_bps;
       int missedFrags;
@@ -393,8 +393,8 @@ namespace DTSC {
       bool live;
       bool merged;
       uint16_t version;
-      long long int moreheader;
-      long long int bufferWindow;
+      int64_t moreheader;
+      int64_t bufferWindow;
       int64_t bootMsOffset;///< Millis to add to packet timestamps to get millis since system boot.
       std::string sourceURI;
       JSON::Value inputLocalVars;

lib/dtscmeta.cpp

@@ -502,7 +502,7 @@ namespace DTSC {
 
   ///\brief Returns the size of this packet.
   ///\return The size of this packet.
-  uint64_t Packet::getDataLen() const {
+  size_t Packet::getDataLen() const {
     return dataLen;
   }
 
@@ -2125,8 +2125,8 @@ namespace DTSC {
       result["lang"] = lang;
     }
     result["trackid"] = trackID;
-    result["firstms"] = (long long)firstms;
-    result["lastms"] = (long long)lastms;
+    result["firstms"] = firstms;
+    result["lastms"] = lastms;
     result["bps"] = bps;
     result["maxbps"] = max_bps;
     if (missedFrags) {
@@ -2158,22 +2158,22 @@ namespace DTSC {
       result["tracks"][it->second.getWritableIdentifier()] = it->second.toJSON();
     }
     if (vod) {
-      result["vod"] = 1ll;
+      result["vod"] = 1;
     }
     if (live) {
-      result["live"] = 1ll;
+      result["live"] = 1;
     }
     if (merged) {
-      result["merged"] = 1ll;
+      result["merged"] = 1;
     }
     if (bufferWindow) {
       result["buffer_window"] = bufferWindow;
     }
     if (version) {
-      result["version"] = (long long)version;
+      result["version"] = version;
     }
     if (bootMsOffset){
-      result["bootoffset"] = (long long)bootMsOffset;
+      result["bootoffset"] = bootMsOffset;
     }
     if (sourceURI.size()){
       result["source"] = sourceURI;

lib/json.cpp

@@ -469,12 +469,6 @@ JSON::Value::Value(const char *val){
   intVal = 0;
 }
 
-/// Sets this JSON::Value to the given integer.
-JSON::Value::Value(long long int val){
-  myType = INTEGER;
-  intVal = val;
-}
-
 /// Sets this JSON::Value to the given integer.
 JSON::Value::Value(uint32_t val){
   myType = INTEGER;
@@ -654,14 +648,6 @@ JSON::Value &JSON::Value::operator=(const char *rhs){
   return ((*this) = (std::string)rhs);
 }
 
-/// Sets this JSON::Value to the given integer.
-JSON::Value &JSON::Value::operator=(const long long int &rhs){
-  null();
-  myType = INTEGER;
-  intVal = rhs;
-  return *this;
-}
-
 /// Sets this JSON::Value to the given integer.
 JSON::Value &JSON::Value::operator=(const int64_t &rhs){
   null();

lib/json.h

@@ -41,7 +41,6 @@ namespace JSON{
     Value(std::istream &fromstream);
     Value(const std::string &val);
     Value(const char *val);
-    Value(long long int val);
     Value(int32_t val);
     Value(int64_t val);
     Value(uint32_t val);
@@ -58,7 +57,6 @@ namespace JSON{
     Value &operator=(const Value &rhs);
     Value &operator=(const std::string &rhs);
     Value &operator=(const char *rhs);
-    Value &operator=(const long long int &rhs);
     Value &operator=(const int64_t &rhs);
     Value &operator=(const int32_t &rhs);
     Value &operator=(const uint64_t &rhs);