Commit 5ef61b6f authored by Sébastien Escudier's avatar Sébastien Escudier

Contribs : update live-uselocale. (cherry-picked from master).

parent 1a0fa3e2
...@@ -66,10 +66,34 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp ...@@ -66,10 +66,34 @@ 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);
}
@@ -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);
}
--- live/liveMedia/RTSPClient.cpp 2010-08-24 17:05:46.000000000 +0200
+++ live.new/liveMedia/RTSPClient.cpp 2010-08-24 17:04:50.000000000 +0200
@@ -935,7 +935,7 @@
} }
Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) { Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
...@@ -78,13 +102,12 @@ diff -ru live/liveMedia/RTSPClient.cpp live_fixed/liveMedia/RTSPClient.cpp ...@@ -78,13 +102,12 @@ diff -ru live/liveMedia/RTSPClient.cpp live_fixed/liveMedia/RTSPClient.cpp
return sscanf(paramStr, "%f", &scale) == 1; return sscanf(paramStr, "%f", &scale) == 1;
} }
diff -ru live/liveMedia/RTSPCommon.cpp live_fixed/liveMedia/RTSPCommon.cpp --- live/liveMedia/RTSPCommon.cpp.orig 2011-01-06 01:26:50.000000000 +0100
--- live/liveMedia/RTSPCommon.cpp 2010-06-04 21:16:00.000000000 +0200 +++ live/liveMedia/RTSPCommon.cpp 2011-01-09 16:32:24.142645155 +0100
+++ live_fixed/liveMedia/RTSPCommon.cpp 2010-06-04 21:15:45.000000000 +0200 @@ -137,7 +137,7 @@
@@ -136,7 +136,7 @@
Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) { Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
double start, end; double start, end;
int numCharsMatched = 0;
- 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(paramStr, "npt = %lf - %lf", &start, &end) == 2) {
......
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