Hi, we carry three patches (attached) in the Debian package that predate my involvement in the Debian packaging. Are these patches acceptable?
-- Benjamin Drung Debian & Ubuntu Developer
--- liveMedia/H263plusVideoRTPSink.cpp | 2 +- liveMedia/MPEG1or2Demux.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp +++ liblivemedia/liveMedia/MPEG1or2Demux.cpp @@ -161,7 +161,7 @@ void MPEG1or2Demux::registerReadInterest // Make sure this stream is not already being read: if (out.isCurrentlyAwaitingData) { envir() << "MPEG1or2Demux::registerReadInterest(): attempt to read stream id " - << (void*)streamIdTag << " more than once!\n"; + << streamIdTag << " more than once!\n"; envir().internalError(); } @@ -460,7 +460,7 @@ void MPEGProgramStreamParser::parsePackH skipBytes(pack_stuffing_length); } else { // unknown fUsingDemux->envir() << "StreamParser::parsePack() saw strange byte " - << (void*)nextByte + << nextByte << " following pack_start_code\n"; } --- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp +++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp @@ -64,7 +64,7 @@ void H263plusVideoRTPSink } if (frameStart[0] != 0 || frameStart[1] != 0) { envir() << "H263plusVideoRTPSink::doSpecialFrameHandling(): unexpected non-zero first two bytes: " - << (void*)(frameStart[0]) << "," << (void*)(frameStart[1]) << "\n"; + << (frameStart[0]) << "," << (frameStart[1]) << "\n"; } frameStart[0] = specialHeader>>8; frameStart[1] = (unsigned char)specialHeader;
--- groupsock/GroupsockHelper.cpp | 2 ++ 1 file changed, 2 insertions(+) --- liblivemedia.orig/groupsock/GroupsockHelper.cpp +++ liblivemedia/groupsock/GroupsockHelper.cpp @@ -444,12 +444,14 @@ Boolean socketLeaveGroup(UsageEnvironmen // commands, and a special structure (ip_mreq_source). If the include files // didn't define these, we do so here: #if !defined(IP_ADD_SOURCE_MEMBERSHIP) +#ifndef __GLIBC__ struct ip_mreq_source { struct in_addr imr_multiaddr; /* IP multicast address of group */ struct in_addr imr_sourceaddr; /* IP address of source */ struct in_addr imr_interface; /* local IP address of interface */ }; #endif +#endif #ifndef IP_ADD_SOURCE_MEMBERSHIP
Description: Re-enable synchronous interface in RTSPClient to avoid API breakage. Author: Alessio Treglia <ales...@debian.org> Forwarded: not-needed --- liveMedia/RTSPClient.cpp | 3 --- liveMedia/include/RTSPClient.hh | 2 -- 2 files changed, 5 deletions(-) --- liblivemedia.orig/liveMedia/RTSPClient.cpp +++ liblivemedia/liveMedia/RTSPClient.cpp @@ -1756,7 +1756,6 @@ RTSPClient::RequestRecord* RTSPClient::R } -#ifdef RTSPCLIENT_SYNCHRONOUS_INTERFACE // Implementation of the old (synchronous) "RTSPClient" interface, using the new (asynchronous) interface: RTSPClient* RTSPClient::createNew(UsageEnvironment& env, int verbosityLevel, @@ -2076,5 +2075,3 @@ void RTSPClient::timeoutHandlerForSyncIn // Signal a break from the event loop (thereby returning from the blocking command): fWatchVariableForSyncInterface = ~0; } - -#endif --- liblivemedia.orig/liveMedia/include/RTSPClient.hh +++ liblivemedia/liveMedia/include/RTSPClient.hh @@ -306,7 +306,6 @@ private: unsigned fSessionCookieCounter; Boolean fHTTPTunnelingConnectionIsPending; -#ifdef RTSPCLIENT_SYNCHRONOUS_INTERFACE // Old "RTSPClient" interface, which performs synchronous (blocking) operations. // This will eventually go away, so new applications should not use it. public: @@ -365,7 +364,6 @@ private: // used to implement the old in char fWatchVariableForSyncInterface; char* fResultString; int fResultCode; -#endif }; #endif
_______________________________________________ live-devel mailing list live-devel@lists.live555.com http://lists.live555.com/mailman/listinfo/live-devel