Commit d6092d8d authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 2018.11.26

parent d40ad837
......@@ -4,7 +4,7 @@
#ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
#define _BASICUSAGEENVIRONMENT_VERSION_HH
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.10.17"
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1539734400
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.11.26"
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1543190400
#endif
......@@ -4,7 +4,7 @@
#ifndef _USAGEENVIRONMENT_VERSION_HH
#define _USAGEENVIRONMENT_VERSION_HH
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.10.17"
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1539734400
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.11.26"
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1543190400
#endif
......@@ -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=64
libliveMedia_VERSION_REVISION=3
libliveMedia_VERSION_REVISION=4
libliveMedia_VERSION_AGE=0
libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
......
......@@ -4,7 +4,7 @@
#ifndef _GROUPSOCK_VERSION_HH
#define _GROUPSOCK_VERSION_HH
#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.10.17"
#define GROUPSOCK_LIBRARY_VERSION_INT 1539734400
#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.11.26"
#define GROUPSOCK_LIBRARY_VERSION_INT 1543190400
#endif
This diff is collapsed.
......@@ -701,25 +701,25 @@ Boolean MatroskaFileParser::parseTrack() {
fprintf(stderr, "\tPrimaries %u\n", primaries);
#endif
if (track != NULL) {
switch (primaries) {
case 1: //ITU-R BT.709
track->colorimetry = "BT709-2";
break;
case 7: //SMPTE 240M
track->colorimetry = "SMPTE240M";
break;
case 2: //Unspecified
case 3: //Reserved
case 4: //ITU-R BT.470M
case 5: //ITU-R BT.470BG
case 6: //SMPTE 170M
case 8: //FILM
case 9: //ITU-R BT.2020
default:
switch (primaries) {
case 1: //ITU-R BT.709
track->colorimetry = "BT709-2";
break;
case 7: //SMPTE 240M
track->colorimetry = "SMPTE240M";
break;
case 2: //Unspecified
case 3: //Reserved
case 4: //ITU-R BT.470M
case 5: //ITU-R BT.470BG
case 6: //SMPTE 170M
case 8: //FILM
case 9: //ITU-R BT.2020
default:
#ifdef DEBUG
fprintf(stderr, "\tUnsupported color primaries %u\n", primaries);
#endif
break;
#endif
break;
}
}
}
......
......@@ -541,8 +541,8 @@ Boolean RTSPServer::RTSPClientConnection
}
RTSPServer::RTSPClientConnection* prevClientConnection
= (RTSPServer::RTSPClientConnection*)(fOurRTSPServer.fClientConnectionsForHTTPTunneling->Lookup(sessionCookie));
if (prevClientConnection == NULL) {
// There was no previous HTTP "GET" request; treat this "POST" request as bad:
if (prevClientConnection == NULL || prevClientConnection == this) {
// Either there was no previous HTTP "GET" request, or it was on the same connection; treat this "POST" request as bad:
handleHTTPCmd_notSupported();
fIsActive = False; // triggers deletion of ourself
return False;
......
......@@ -4,7 +4,7 @@
#ifndef _LIVEMEDIA_VERSION_HH
#define _LIVEMEDIA_VERSION_HH
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.10.17"
#define LIVEMEDIA_LIBRARY_VERSION_INT 1539734400
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.11.26"
#define LIVEMEDIA_LIBRARY_VERSION_INT 1543190400
#endif
......@@ -5,6 +5,6 @@
#ifndef _MEDIA_SERVER_VERSION_HH
#define _MEDIA_SERVER_VERSION_HH
#define MEDIA_SERVER_VERSION_STRING "0.93"
#define MEDIA_SERVER_VERSION_STRING "0.94"
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment