From da8567888afbff44859b2f47edfa53f0572bbb6a Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 16 Feb 2011 21:51:54 +0100
Subject: [PATCH] Connector_HTTP compilend - klaar voor test!
---
Connector_HTTP/main.cpp | 2 +-
util/MP4/box_avcC.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Connector_HTTP/main.cpp b/Connector_HTTP/main.cpp
index 7b5f0a73..7f2ad113 100644
--- a/Connector_HTTP/main.cpp
+++ b/Connector_HTTP/main.cpp
@@ -17,7 +17,7 @@
enum {HANDLER_NONE, HANDLER_PROGRESSIVE, HANDLER_FLASH, HANDLER_APPLE, HANDLER_MICRO};
-#define DEFAULT_PORT 80
+#define DEFAULT_PORT 8080
#include "../util/server_setup.cpp"
#include "../util/http_parser.cpp"
#include "../util/MP4/interface.cpp"
diff --git a/util/MP4/box_avcC.cpp b/util/MP4/box_avcC.cpp
index 90bc6fe0..2f021957 100644
--- a/util/MP4/box_avcC.cpp
+++ b/util/MP4/box_avcC.cpp
@@ -1,5 +1,6 @@
#include "box.cpp"
#include <string>
+#include <algorithm>
class Box_avcC {
public:
@@ -57,7 +58,7 @@ void Box_avcC::SetFrameCount ( uint16_t FrameCount ) {
void Box_avcC::SetCompressorName ( std::string CompressorName ) {
uint8_t * Printable = new uint8_t[1];
- Printable[0] = std::min( (unsigned int)31, CompressorName.size() );
+ Printable[0] = std::min( (unsigned int)31, (unsigned int)CompressorName.size() );
Container->SetPayload((uint32_t)Printable[0],(uint8_t*)CompressorName.c_str(),43);
Container->SetPayload((uint32_t)1, Printable ,42);
}