Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
29a112b6
Commit
29a112b6
authored
Aug 24, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update again to latest live555 patch
I obviously didn't had the latest.tar.gz
parent
87ba62f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
10 deletions
+25
-10
extras/contrib/src/Patches/live-inet_ntop.patch
extras/contrib/src/Patches/live-inet_ntop.patch
+13
-0
extras/contrib/src/Patches/live-uselocale.patch
extras/contrib/src/Patches/live-uselocale.patch
+12
-10
No files found.
extras/contrib/src/Patches/live-inet_ntop.patch
View file @
29a112b6
...
@@ -142,6 +142,19 @@ diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/Pas
...
@@ -142,6 +142,19 @@ diff -ru live.orig/liveMedia/PassiveServerMediaSubsession.cpp live/liveMedia/Pas
fSDPLines = strDup(sdpLines);
fSDPLines = strDup(sdpLines);
delete[] 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
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.orig/liveMedia/RTSPOverHTTPServer.cpp 2010-05-30 01:20:31.000000000 +0300
+++ live/liveMedia/RTSPOverHTTPServer.cpp 2010-06-06 00:34:03.000000000 +0300
+++ live/liveMedia/RTSPOverHTTPServer.cpp 2010-06-06 00:34:03.000000000 +0300
...
...
extras/contrib/src/Patches/live-uselocale.patch
View file @
29a112b6
...
@@ -91,23 +91,25 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
...
@@ -91,23 +91,25 @@ diff -urN live.orig/liveMedia/Locale.cpp live/liveMedia/Locale.cpp
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
}
}
@@ -2328,7 +2328,7 @@
--- live/liveMedia/RTSPClient.cpp 2010-08-24 17:05:46.000000000 +0200
if (_strncasecmp(line, "Scale: ", 7) != 0) return False;
+++ live.new/liveMedia/RTSPClient.cpp 2010-08-24 17:04:50.000000000 +0200
line += 7;
@@ -935,7 +935,7 @@
}
Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
- Locale l("C", LC_NUMERIC);
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
+ Locale l("C", LC_NUMERIC_MASK);
return sscanf(
line
, "%f", &scale) == 1;
return sscanf(
paramStr
, "%f", &scale) == 1;
}
}
--- live
.orig/liveMedia/RTSPCommon.cpp 2010-03-16 03:09:46.000000000 +01
00
--- live
/liveMedia/RTSPCommon.cpp.orig 2010-08-22 03:25:03.000000000 +02
00
+++ live/liveMedia/RTSPCommon.cpp 2010-08-24 1
5:04:44
.000000000 +0200
+++ live/liveMedia/RTSPCommon.cpp 2010-08-24 1
7:06:36
.000000000 +0200
@@ -1
46,7 +14
6,7 @@
@@ -1
36,7 +13
6,7 @@
char const* fields = buf + 7;
while (*fields == ' ') ++fields;
Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
double start, end;
double start, end;
- Locale l("C", LC_NUMERIC);
- Locale l("C", LC_NUMERIC);
+ Locale l("C", LC_NUMERIC_MASK);
+ 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;
rangeStart = start;
rangeEnd = end;
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