Sync with latest live555 source code.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index cb749095a70b359fe13d0a136e1cd040f861b7ce..32c98c55fe26c8a5d70e8ef1b606d8abcf054158 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1226,7 +1226,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/live.patch
+#      patch -p0 < Patches/live.patch
 ifdef HAVE_WIN32 
        patch -p0 < Patches/livedotcom-win32.patch
 endif

diff --git a/extras/contrib/src/Patches/live-starttime.patch b/extras/contrib/src/Patches/live-starttime.patch
index 4b24f0a521178d1112b9ea014b89f2d9ba296d1f..1fe83c56562f4fbb6591264f5e7aeb52deccaa76 100644 (file)
--- a/extras/contrib/src/Patches/live-starttime.patch
+++ b/extras/contrib/src/Patches/live-starttime.patch
@@ -104,9 +104,9 @@ diff -ruN live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
 +Boolean RTSPClient::parseRangeHeader(char const* line, float& start, float& end) {
 +  if (_strncasecmp(line, "Range: ", 7) != 0) return False;
 +  line += 7;
-+
 +  /* "npt=start-" is also valid */
-+  return radix_safe_sscanf(line, "npt = %f - %f", &start, &end) >= 1;
++  Locale("C", LC_NUMERIC);
++  return (sscanf(line, "npt = %f - %f", &start, &end) >= 1);
 +}
 +
  Boolean RTSPClient::parseGetParameterHeader(char const* line,