Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
b62d3469
Commit
b62d3469
authored
Mar 25, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: Update live555 patch for locale.
CLose #2596
parent
7f1ae44e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
41 deletions
+39
-41
extras/contrib/src/Patches/live-uselocale.patch
extras/contrib/src/Patches/live-uselocale.patch
+39
-41
No files found.
extras/contrib/src/Patches/live-uselocale.patch
View file @
b62d3469
...
@@ -38,53 +38,17 @@ diff -ru live-orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
...
@@ -38,53 +38,17 @@ diff -ru live-orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
}
}
#endif
#endif
}
}
diff -ru live-orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
--- live/liveMedia/RTSPCommon.cpp.orig 2009-01-26 20:18:41.000000000 +0100
--- live-orig/liveMedia/RTSPClient.cpp 2009-02-13 09:09:42.000000000 +0100
+++ live/liveMedia/RTSPCommon.cpp 2009-03-25 20:35:43.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
@@ -146,7 +146,7 @@
@@ -146,7 +146,7 @@
char const* fields = buf + 7;
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
while (*fields == ' ') ++fields;
double start, end;
double start, end;
- Locale
l
("C", LC_NUMERIC);
- Locale("C", LC_NUMERIC);
+ Locale
l
("C", LC_NUMERIC_MASK);
+ Locale("C", LC_NUMERIC_MASK);
if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
if (sscanf(fields, "npt = %lf - %lf", &start, &end) == 2) {
rangeStart = start;
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
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-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
+++ 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
...
@@ -122,3 +86,37 @@ diff -ru live-orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
};
};
#endif
#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;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment