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
b0eb4405
Commit
b0eb4405
authored
Aug 24, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update live555 patch
parent
e29a34ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
27 deletions
+35
-27
extras/contrib/src/Patches/live-inet_ntop.patch
extras/contrib/src/Patches/live-inet_ntop.patch
+0
-13
extras/contrib/src/Patches/live-uselocale.patch
extras/contrib/src/Patches/live-uselocale.patch
+35
-14
No files found.
extras/contrib/src/Patches/live-inet_ntop.patch
View file @
b0eb4405
...
...
@@ -142,19 +142,6 @@ diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/Pas
fSDPLines = strDup(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
--- 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
...
...
extras/contrib/src/Patches/live-uselocale.patch
View file @
b0eb4405
...
...
@@ -66,27 +66,48 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
}
#endif
}
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 @@
}
--- live.orig/liveMedia/RTSPClient.cpp 2010-03-16 03:09:46.000000000 +0100
+++ live/liveMedia/RTSPClient.cpp 2010-08-24 15:04:31.000000000 +0200
@@ -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);
}
@@ -2328,7 +2328,7 @@
if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
line += 7;
Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
return sscanf(
paramStr
, "%f", &scale) == 1;
return sscanf(
line
, "%f", &scale) == 1;
}
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) {
--- 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;
- Locale l("C", LC_NUMERIC);
+ 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;
rangeEnd = end;
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