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

Contribs: Update live555 patch for locale.

CLose #2596
parent 7f1ae44e
......@@ -38,53 +38,17 @@ diff -ru live-orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
}
#endif
}
diff -ru live-orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
--- live-orig/liveMedia/RTSPClient.cpp 2009-02-13 09:09:42.000000000 +0100
+++ live/liveMedia/RTSPClient.cpp 2009-02-20 14:27:06.000000000 +0100
@@ -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;
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
return sscanf(line, "%f", &scale) == 1;
}
diff -ru live-orig/liveMedia/RTSPCommon.cpp live/liveMedia/RTSPCommon.cpp
--- live-orig/liveMedia/RTSPCommon.cpp 2009-02-13 09:09:42.000000000 +0100
+++ live/liveMedia/RTSPCommon.cpp 2009-02-20 14:26:01.000000000 +0100
--- live/liveMedia/RTSPCommon.cpp.orig 2009-01-26 20:18:41.000000000 +0100
+++ live/liveMedia/RTSPCommon.cpp 2009-03-25 20:35:43.000000000 +0100
@@ -146,7 +146,7 @@
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
double start, end;
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
- Locale("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK);
if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start;
rangeEnd = end;
rangeEnd = end;diff -ru live-orig/liveMedia/RTSPCommon.cpp live/liveMedia/RTSPCommon.cpp
diff -ru live-orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
--- live-orig/liveMedia/include/Locale.hh 2009-02-13 09:09:42.000000000 +0100
+++ live/liveMedia/include/Locale.hh 2009-02-20 14:17:20.000000000 +0100
......@@ -122,3 +86,37 @@ diff -ru live-orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
};
#endif
--- live/liveMedia/RTSPClient.cpp.orig 2009-01-26 20:18:41.000000000 +0100
+++ live/liveMedia/RTSPClient.cpp 2009-03-25 20:35:18.000000000 +0100
@@ -1019,7 +1019,7 @@
// This is the default value; we don't need a "Scale:" header:
buf[0] = '\0';
} else {
- Locale("C", LC_NUMERIC);
+ Locale("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("C", LC_NUMERIC);
+ Locale("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("C", LC_NUMERIC);
+ Locale("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;
- Locale("C", LC_NUMERIC);
+ Locale("C", LC_NUMERIC_MASK);
return sscanf(line, "%f", &scale) == 1;
}
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