From 0251671709ebbfaa38622a30168dc2d502d3512b Mon Sep 17 00:00:00 2001 From: mpromonet Date: Tue, 10 May 2022 12:30:16 +0200 Subject: [PATCH] fix #278: initialize m_format earlier --- inc/MulticastServerMediaSubsession.h | 7 ++++--- inc/UnicastServerMediaSubsession.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/inc/MulticastServerMediaSubsession.h b/inc/MulticastServerMediaSubsession.h index d41327d..9937d46 100644 --- a/inc/MulticastServerMediaSubsession.h +++ b/inc/MulticastServerMediaSubsession.h @@ -14,7 +14,7 @@ // ----------------------------------------- // ServerMediaSubsession for Multicast // ----------------------------------------- -class MulticastServerMediaSubsession : public PassiveServerMediaSubsession , public BaseServerMediaSubsession +class MulticastServerMediaSubsession : public BaseServerMediaSubsession, public PassiveServerMediaSubsession { public: static MulticastServerMediaSubsession* createNew(UsageEnvironment& env @@ -29,9 +29,10 @@ class MulticastServerMediaSubsession : public PassiveServerMediaSubsession , pub , Port rtpPortNum, Port rtcpPortNum , int ttl , StreamReplicator* replicator) - : PassiveServerMediaSubsession(*this->createRtpSink(env, destinationAddress, rtpPortNum, rtcpPortNum, ttl, replicator) + : BaseServerMediaSubsession(replicator) + , PassiveServerMediaSubsession(*this->createRtpSink(env, destinationAddress, rtpPortNum, rtcpPortNum, ttl, replicator) , m_rtcpInstance) - , BaseServerMediaSubsession(replicator) {}; + {} virtual char const* sdpLines() ; virtual char const* getAuxSDPLine(RTPSink* rtpSink,FramedSource* inputSource); diff --git a/inc/UnicastServerMediaSubsession.h b/inc/UnicastServerMediaSubsession.h index dbce5da..0894a59 100644 --- a/inc/UnicastServerMediaSubsession.h +++ b/inc/UnicastServerMediaSubsession.h @@ -14,14 +14,14 @@ // ----------------------------------------- // ServerMediaSubsession for Unicast // ----------------------------------------- -class UnicastServerMediaSubsession : public OnDemandServerMediaSubsession , public BaseServerMediaSubsession +class UnicastServerMediaSubsession : public BaseServerMediaSubsession, public OnDemandServerMediaSubsession { public: static UnicastServerMediaSubsession* createNew(UsageEnvironment& env, StreamReplicator* replicator); protected: UnicastServerMediaSubsession(UsageEnvironment& env, StreamReplicator* replicator) - : OnDemandServerMediaSubsession(env, False), BaseServerMediaSubsession(replicator) {} + : BaseServerMediaSubsession(replicator), OnDemandServerMediaSubsession(env, False) {} virtual FramedSource* createNewStreamSource(unsigned clientSessionId, unsigned& estBitrate); virtual RTPSink* createNewRTPSink(Groupsock* rtpGroupsock, unsigned char rtpPayloadTypeIfDynamic, FramedSource* inputSource);