[SCM] liblivemedia/master: New upstream version 2016.11.28
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Thu Dec 1 21:33:50 UTC 2016
The following commit has been merged in the master branch:
commit 13bf12426ee363bb3bb584b89179197ec80a1211
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Thu Dec 1 21:21:32 2016 +0100
New upstream version 2016.11.28
diff --git a/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh b/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh
index 610d913..e2e1f57 100644
--- a/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh
+++ b/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh
@@ -4,7 +4,7 @@
#ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
#define _BASICUSAGEENVIRONMENT_VERSION_HH
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2016.11.17"
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1479340800
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2016.11.28"
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1480291200
#endif
diff --git a/UsageEnvironment/include/UsageEnvironment_version.hh b/UsageEnvironment/include/UsageEnvironment_version.hh
index 0dcf35c..8ea44b0 100644
--- a/UsageEnvironment/include/UsageEnvironment_version.hh
+++ b/UsageEnvironment/include/UsageEnvironment_version.hh
@@ -4,7 +4,7 @@
#ifndef _USAGEENVIRONMENT_VERSION_HH
#define _USAGEENVIRONMENT_VERSION_HH
-#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2016.11.17"
-#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1479340800
+#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2016.11.28"
+#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1480291200
#endif
diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
index 0f52db4..270771d 100644
--- a/config.linux-with-shared-libraries
+++ b/config.linux-with-shared-libraries
@@ -4,7 +4,7 @@
# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
libliveMedia_VERSION_CURRENT=57
-libliveMedia_VERSION_REVISION=4
+libliveMedia_VERSION_REVISION=5
libliveMedia_VERSION_AGE=0
libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
diff --git a/groupsock/include/groupsock_version.hh b/groupsock/include/groupsock_version.hh
index dfdde49..d8649d9 100644
--- a/groupsock/include/groupsock_version.hh
+++ b/groupsock/include/groupsock_version.hh
@@ -4,7 +4,7 @@
#ifndef _GROUPSOCK_VERSION_HH
#define _GROUPSOCK_VERSION_HH
-#define GROUPSOCK_LIBRARY_VERSION_STRING "2016.11.17"
-#define GROUPSOCK_LIBRARY_VERSION_INT 1479340800
+#define GROUPSOCK_LIBRARY_VERSION_STRING "2016.11.28"
+#define GROUPSOCK_LIBRARY_VERSION_INT 1480291200
#endif
diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp
index 714b463..5f2339c 100644
--- a/liveMedia/RTSPClient.cpp
+++ b/liveMedia/RTSPClient.cpp
@@ -866,9 +866,10 @@ int RTSPClient::openConnection() {
}
// We don't yet have a TCP socket (or we used to have one, but it got closed). Set it up now.
- fInputSocketNum = fOutputSocketNum = setupStreamSocket(envir(), 0);
+ fInputSocketNum = setupStreamSocket(envir(), 0);
if (fInputSocketNum < 0) break;
ignoreSigPipeOnSocket(fInputSocketNum); // so that servers on the same host that get killed don't also kill us
+ if (fOutputSocketNum < 0) fOutputSocketNum = fInputSocketNum;
// Connect to the remote endpoint:
fServerAddress = *(netAddressBits*)(destAddress.data());
@@ -1748,7 +1749,7 @@ void RTSPClient::handleResponseBytes(int newBytesRead) {
delete[] newBaseURL;
}
} else if (checkForHeader(lineStart, "Connection:", 11, headerParamsStr)) {
- if (_strncasecmp(headerParamsStr, "Close", 5) == 0) {
+ if (fTunnelOverHTTPPortNum == 0 && _strncasecmp(headerParamsStr, "Close", 5) == 0) {
resetTCPSockets();
}
}
diff --git a/liveMedia/include/liveMedia_version.hh b/liveMedia/include/liveMedia_version.hh
index 5560dc6..163f219 100644
--- a/liveMedia/include/liveMedia_version.hh
+++ b/liveMedia/include/liveMedia_version.hh
@@ -4,7 +4,7 @@
#ifndef _LIVEMEDIA_VERSION_HH
#define _LIVEMEDIA_VERSION_HH
-#define LIVEMEDIA_LIBRARY_VERSION_STRING "2016.11.17"
-#define LIVEMEDIA_LIBRARY_VERSION_INT 1479340800
+#define LIVEMEDIA_LIBRARY_VERSION_STRING "2016.11.28"
+#define LIVEMEDIA_LIBRARY_VERSION_INT 1480291200
#endif
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list