Commit d40ad837 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 2018.10.17

parent 5039d414
......@@ -4,7 +4,7 @@
#ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
#define _BASICUSAGEENVIRONMENT_VERSION_HH
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.09.18"
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1537228800
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.10.17"
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1539734400
#endif
......@@ -4,7 +4,7 @@
#ifndef _USAGEENVIRONMENT_VERSION_HH
#define _USAGEENVIRONMENT_VERSION_HH
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.09.18"
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1537228800
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2018.10.17"
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1539734400
#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=2
libliveMedia_VERSION_REVISION=3
libliveMedia_VERSION_AGE=0
libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
......@@ -19,7 +19,7 @@ libUsageEnvironment_VERSION_AGE=1
libUsageEnvironment_LIB_SUFFIX=so.$(shell expr $(libUsageEnvironment_VERSION_CURRENT) - $(libUsageEnvironment_VERSION_AGE)).$(libUsageEnvironment_VERSION_AGE).$(libUsageEnvironment_VERSION_REVISION)
libgroupsock_VERSION_CURRENT=10
libgroupsock_VERSION_REVISION=1
libgroupsock_VERSION_REVISION=2
libgroupsock_VERSION_AGE=2
libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
#####
......
......@@ -29,6 +29,10 @@ extern "C" int initializeWinsockIfNecessary();
#include <sys/time.h>
#if !defined(_WIN32)
#include <netinet/tcp.h>
#ifdef __ANDROID_NDK__
#include <android/ndk-version.h>
#define ANDROID_OLD_NDK __NDK_MAJOR__ < 17
#endif
#endif
#include <fcntl.h>
#define initializeWinsockIfNecessary() 1
......@@ -563,7 +567,7 @@ Boolean socketJoinGroupSSM(UsageEnvironment& env, int socket,
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
struct ip_mreq_source imr;
#ifdef __ANDROID__
#if ANDROID_OLD_NDK
imr.imr_multiaddr = groupAddress;
imr.imr_sourceaddr = sourceFilterAddr;
imr.imr_interface = ReceivingInterfaceAddr;
......@@ -589,7 +593,7 @@ Boolean socketLeaveGroupSSM(UsageEnvironment& /*env*/, int socket,
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
struct ip_mreq_source imr;
#ifdef __ANDROID__
#if ANDROID_OLD_NDK
imr.imr_multiaddr = groupAddress;
imr.imr_sourceaddr = sourceFilterAddr;
imr.imr_interface = ReceivingInterfaceAddr;
......@@ -885,3 +889,4 @@ int gettimeofday(struct timeval* tp, int* /*tz*/) {
return 0;
}
#endif
#undef ANDROID_OLD_NDK
......@@ -4,7 +4,7 @@
#ifndef _GROUPSOCK_VERSION_HH
#define _GROUPSOCK_VERSION_HH
#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.09.18"
#define GROUPSOCK_LIBRARY_VERSION_INT 1537228800
#define GROUPSOCK_LIBRARY_VERSION_STRING "2018.10.17"
#define GROUPSOCK_LIBRARY_VERSION_INT 1539734400
#endif
......@@ -940,8 +940,6 @@ void H264or5VideoStreamParser::flushInput() {
StreamParser::flushInput();
}
#define NUM_NEXT_SLICE_HEADER_BYTES_TO_ANALYZE 12
unsigned H264or5VideoStreamParser::parse() {
try {
// The stream must start with a 0x00000001:
......
......@@ -391,12 +391,12 @@ static void lookForHeader(char const* headerName, char const* source, unsigned s
for (unsigned j = i; j < sourceLen; ++j) {
if (source[j] == '\r' || source[j] == '\n') {
// We've found the end of the line. Copy it to the result (if it will fit):
if (j-i+1 > resultMaxSize) break;
if (j-i+1 > resultMaxSize) return; // it wouldn't fit
char const* resultSource = &source[i];
char const* resultSourceEnd = &source[j];
while (resultSource < resultSourceEnd) *resultStr++ = *resultSource++;
*resultStr = '\0';
break;
return;
}
}
}
......
......@@ -4,7 +4,7 @@
#ifndef _LIVEMEDIA_VERSION_HH
#define _LIVEMEDIA_VERSION_HH
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.09.18"
#define LIVEMEDIA_LIBRARY_VERSION_INT 1537228800
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2018.10.17"
#define LIVEMEDIA_LIBRARY_VERSION_INT 1539734400
#endif
......@@ -5,6 +5,6 @@
#ifndef _MEDIA_SERVER_VERSION_HH
#define _MEDIA_SERVER_VERSION_HH
#define MEDIA_SERVER_VERSION_STRING "0.92"
#define MEDIA_SERVER_VERSION_STRING "0.93"
#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