fix build with live555 2021.01.18

pull/228/head
mpromonet 3 years ago
parent 4b21da9317
commit fc1ba41062

@ -154,7 +154,11 @@ class HTTPServer : public RTSPServer
static HTTPServer* createNew(UsageEnvironment& env, Port rtspPort, UserAuthenticationDatabase* authDatabase, unsigned reclamationTestSeconds, unsigned int hlsSegment, const std::string webroot)
{
HTTPServer* httpServer = NULL;
#if LIVEMEDIA_LIBRARY_VERSION_INT < 1610928000
int ourSocket = setUpOurSocket(env, rtspPort);
#else
int ourSocket = setUpOurSocket(env, rtspPort, AF_INET);
#endif
if (ourSocket != -1)
{
httpServer = new HTTPServer(env, ourSocket, rtspPort, authDatabase, reclamationTestSeconds, hlsSegment, webroot);

@ -55,8 +55,12 @@ char const* MulticastServerMediaSubsession::sdpLines()
{
if (m_SDPLines.empty())
{
// Ugly workaround to give SPS/PPS that are get from the RTPSink
// Ugly workaround to give SPS/PPS that are get from the RTPSink
#if LIVEMEDIA_LIBRARY_VERSION_INT < 1610928000
m_SDPLines.assign(PassiveServerMediaSubsession::sdpLines());
#else
m_SDPLines.assign(PassiveServerMediaSubsession::sdpLines(AF_INET));
#endif
m_SDPLines.append(getAuxSDPLine(m_rtpSink,NULL));
}
return m_SDPLines.c_str();

Loading…
Cancel
Save