mirror of
https://github.com/mpromonet/v4l2rtspserver
synced 2024-11-16 00:12:56 +00:00
remove live555 patch that is now fixed since release 2024-08-01
This commit is contained in:
parent
e9322f114d
commit
5b90e188c7
@ -86,11 +86,6 @@ else()
|
||||
if(NOT unpack_result STREQUAL "0")
|
||||
message(FATAL_ERROR "Fetching and compiling live555 failed!")
|
||||
endif()
|
||||
message(STATUS "patch live555")
|
||||
EXECUTE_PROCESS(COMMAND patch -d ${CMAKE_BINARY_DIR} -f -p 1 -i ${PROJECT_SOURCE_DIR}/patches/001_live555_sprintf_format RESULT_VARIABLE patch_result)
|
||||
if(NOT patch_result STREQUAL "0")
|
||||
message(FATAL_ERROR "Patching live555 failed! error:${patch_result}")
|
||||
endif()
|
||||
endif()
|
||||
FILE(GLOB LIVESOURCE ${LIVE}/groupsock/*.c* ${LIVE}/liveMedia/*.c* ${LIVE}/UsageEnvironment/*.c* ${LIVE}/BasicUsageEnvironment/*.c*)
|
||||
if (NOT OpenSSL_FOUND)
|
||||
|
@ -1,25 +0,0 @@
|
||||
From: Michel Promonet <michel.promonet@free.fr>
|
||||
Subject: [PATCH] Fix crash formating time_t as long (it is a long long)
|
||||
Signed-off-by: Michel Promonet <michel.promonet@free.fr>
|
||||
|
||||
---
|
||||
--- a/live/liveMedia/ServerMediaSession.cpp
|
||||
+++ b/live/liveMedia/ServerMediaSession.cpp
|
||||
@@ -272,7 +272,7 @@ char* ServerMediaSession::generateSDPDes
|
||||
|
||||
char const* const sdpPrefixFmt =
|
||||
"v=0\r\n"
|
||||
- "o=- %ld%06ld %d IN %s %s\r\n"
|
||||
+ "o=- %lld%06lld %d IN %s %s\r\n"
|
||||
"s=%s\r\n"
|
||||
"i=%s\r\n"
|
||||
"t=0 0\r\n"
|
||||
@@ -300,7 +300,7 @@ char* ServerMediaSession::generateSDPDes
|
||||
|
||||
// Generate the SDP prefix (session-level lines):
|
||||
snprintf(sdp, sdpLength, sdpPrefixFmt,
|
||||
- fCreationTime.tv_sec, fCreationTime.tv_usec, // o= <session id>
|
||||
+ (long long)fCreationTime.tv_sec, (long long)fCreationTime.tv_usec, // o= <session id>
|
||||
1, // o= <version> // (needs to change if params are modified)
|
||||
addressFamily == AF_INET ? "IP4" : "IP6", // o= <address family>
|
||||
ipAddressStr.val(), // o= <address>
|
Loading…
Reference in New Issue
Block a user