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

src/utils/util_amf.cpp

@@ -14,7 +14,7 @@ int main(int argc, char **argv){
   Util::redirectLogsIfNeeded();
   Util::Config conf(argv[0]);
   JSON::Value opt;
-  opt["arg_num"] = 1ll;
+  opt["arg_num"] = 1;
   opt["arg"] = "string";
   opt["default"] = "-";
   opt["help"] = "Filename to analyse, or - for standard input (default)";