From 29a112b6d6f3bd52b0dd1c14161d0c1efb22f303 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Tue, 24 Aug 2010 17:07:38 +0200 Subject: [PATCH] Contribs: update again to latest live555 patch I obviously didn't had the latest.tar.gz --- .../contrib/src/Patches/live-inet_ntop.patch | 13 +++++++++++ .../contrib/src/Patches/live-uselocale.patch | 22 ++++++++++--------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/extras/contrib/src/Patches/live-inet_ntop.patch b/extras/contrib/src/Patches/live-inet_ntop.patch index 22f7d41c43..2148d07484 100644 --- a/extras/contrib/src/Patches/live-inet_ntop.patch +++ b/extras/contrib/src/Patches/live-inet_ntop.patch @@ -142,6 +142,19 @@ 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 diff --git a/extras/contrib/src/Patches/live-uselocale.patch b/extras/contrib/src/Patches/live-uselocale.patch index 67c03ea337..e9acb0e50a 100644 --- a/extras/contrib/src/Patches/live-uselocale.patch +++ b/extras/contrib/src/Patches/live-uselocale.patch @@ -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); } -@@ -2328,7 +2328,7 @@ - if (_strncasecmp(line, "Scale: ", 7) != 0) return False; - line += 7; +--- 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) { - Locale l("C", LC_NUMERIC); + 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 +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; +--- live/liveMedia/RTSPCommon.cpp.orig 2010-08-22 03:25:03.000000000 +0200 ++++ live/liveMedia/RTSPCommon.cpp 2010-08-24 17:06:36.000000000 +0200 +@@ -136,7 +136,7 @@ + + Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) { double start, end; - Locale l("C", LC_NUMERIC); + 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; rangeEnd = end; -- 2.39.2