Commit b0eb4405 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update live555 patch

parent e29a34ad
...@@ -142,19 +142,6 @@ diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/Pas ...@@ -142,19 +142,6 @@ diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/Pas
fSDPLines = strDup(sdpLines); fSDPLines = strDup(sdpLines);
delete[] sdpLines; delete[] sdpLines;
diff -ru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
--- live.orig/liveMedia/RTSPClient.cpp 2010-05-30 01:20:31.000000000 +0300
+++ live/liveMedia/RTSPClient.cpp 2010-06-06 00:39:08.000000000 +0300
@@ -415,7 +415,8 @@
int RTSPClient::connectToServer(int socketNum, portNumBits remotePortNum) {
MAKE_SOCKADDR_IN(remoteName, fServerAddress, htons(remotePortNum));
if (fVerbosityLevel >= 1) {
- envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr) << ", port " << remotePortNum << "...\n";
+ char buf[16];
+ envir() << "Opening connection to " << our_inet_ntoa(remoteName.sin_addr, buf) << ", port " << remotePortNum << "...\n";
}
if (connect(socketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
if (envir().getErrno() == EINPROGRESS) {
diff -ru live.orig/liveMedia/RTSPOverHTTPServer.cpp live/liveMedia/RTSPOverHTTPServer.cpp diff -ru live.orig/liveMedia/RTSPOverHTTPServer.cpp live/liveMedia/RTSPOverHTTPServer.cpp
--- live.orig/liveMedia/RTSPOverHTTPServer.cpp 2010-05-30 01:20:31.000000000 +0300 --- live.orig/liveMedia/RTSPOverHTTPServer.cpp 2010-05-30 01:20:31.000000000 +0300
+++ live/liveMedia/RTSPOverHTTPServer.cpp 2010-06-06 00:34:03.000000000 +0300 +++ live/liveMedia/RTSPOverHTTPServer.cpp 2010-06-06 00:34:03.000000000 +0300
......
...@@ -66,27 +66,48 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp ...@@ -66,27 +66,48 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
} }
#endif #endif
} }
diff -ru live/liveMedia/RTSPClient.cpp live_fixed/liveMedia/RTSPClient.cpp --- live.orig/liveMedia/RTSPClient.cpp 2010-03-16 03:09:46.000000000 +0100
--- live/liveMedia/RTSPClient.cpp 2010-06-04 21:16:00.000000000 +0200 +++ live/liveMedia/RTSPClient.cpp 2010-08-24 15:04:31.000000000 +0200
+++ live_fixed/liveMedia/RTSPClient.cpp 2010-06-04 21:15:19.000000000 +0200 @@ -1019,7 +1019,7 @@
@@ -923,7 +923,7 @@ // This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
} else {
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Scale: %f\r\n", scale);
} }
Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) { @@ -1033,11 +1033,11 @@
buf[0] = '\0';
} else if (end < 0) {
// There's no end time:
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
sprintf(buf, "Range: npt=%.3f-\r\n", start);
} else {
// There's both a start and an end time; include them both in the "Range:" hdr
- Locale l("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
return sscanf(paramStr, "%f", &scale) == 1; sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
} }
diff -ru live/liveMedia/RTSPCommon.cpp live_fixed/liveMedia/RTSPCommon.cpp @@ -2328,7 +2328,7 @@
--- live/liveMedia/RTSPCommon.cpp 2010-06-04 21:16:00.000000000 +0200 if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
+++ live_fixed/liveMedia/RTSPCommon.cpp 2010-06-04 21:15:45.000000000 +0200 line += 7;
@@ -136,7 +136,7 @@
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
return sscanf(line, "%f", &scale) == 1;
}
Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) { --- live.orig/liveMedia/RTSPCommon.cpp 2010-03-16 03:09:46.000000000 +0100
+++ live/liveMedia/RTSPCommon.cpp 2010-08-24 15:04:44.000000000 +0200
@@ -146,7 +146,7 @@
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
double start, end; double start, end;
- Locale l("C", LC_NUMERIC); - Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK); + Locale l("C", LC_NUMERIC_MASK);
if (sscanf(paramStr, "npt = %lf - %lf", &start, &end) == 2) { if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start; rangeStart = start;
rangeEnd = end; rangeEnd = end;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment