Commit 4da38d89 authored by Felix Paul Kühne's avatar Felix Paul Kühne

live: updated patch

parent 79db0f28
......@@ -66,50 +66,27 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
}
#endif
}
diff -urN live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
--- live.orig/liveMedia/RTSPClient.cpp 2009-03-23 01:26:16 +0300
+++ live/liveMedia/RTSPClient.cpp 2009-03-26 19:29:38 +0300
@@ -1019,7 +1019,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);
}
@@ -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_MASK);
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
@@ -2342,7 +2342,7 @@
if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
line += 7;
diff -ru live/liveMedia/RTSPClient.cpp live_fixed/liveMedia/RTSPClient.cpp
--- live/liveMedia/RTSPClient.cpp 2010-06-04 21:16:00.000000000 +0200
+++ live_fixed/liveMedia/RTSPClient.cpp 2010-06-04 21:15:19.000000000 +0200
@@ -923,7 +923,7 @@
}
Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
return sscanf(line, "%f", &scale) == 1;
return sscanf(paramStr, "%f", &scale) == 1;
}
diff -urN live.orig/liveMedia/RTSPCommon.cpp live/liveMedia/RTSPCommon.cpp
--- live.orig/liveMedia/RTSPCommon.cpp 2009-03-23 01:26:16 +0300
+++ live/liveMedia/RTSPCommon.cpp 2009-03-26 19:23:25 +0300
@@ -146,7 +146,7 @@
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
diff -ru live/liveMedia/RTSPCommon.cpp live_fixed/liveMedia/RTSPCommon.cpp
--- live/liveMedia/RTSPCommon.cpp 2010-06-04 21:16:00.000000000 +0200
+++ live_fixed/liveMedia/RTSPCommon.cpp 2010-06-04 21:15:45.000000000 +0200
@@ -136,7 +136,7 @@
Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
double start, end;
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
if (sscanf(paramStr, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start;
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