From e5e2d05da01967a3fdb537f3799c504526edb002 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 22 Mar 2020 19:46:56 +0800 Subject: [PATCH] For #307, support play with WebRTC. 4.0.14 --- README.md | 1 + trunk/auto/depends.sh | 2 +- trunk/configure | 4 ++++ trunk/src/core/srs_core.hpp | 5 +++++ trunk/src/core/srs_core_version4.hpp | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e67fc5f1c..7f4d9fe70 100755 --- a/README.md +++ b/README.md @@ -153,6 +153,7 @@ For previous versions, please read: ## V4 changes +* v4.0, 2020-03-22, For [#307][bug #307], support play with WebRTC. 4.0.14 * v4.0, 2020-03-13, For [#1636][bug #1636], fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13 * v4.0, 2020-03-07, For [#1612][bug #1612], fix crash bug for RTSP. 4.0.12 * v4.0, 2020-03-07, For [#1631][bug #1631], support sei_filter for SRT. 4.0.11 diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 870bb8f51..36cc3a40d 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -443,7 +443,7 @@ if [[ $SRS_EXPORT_LIBRTMP_PROJECT == NO && $SRS_RTC == YES ]]; then --disable-avfoundation --disable-securetransport --disable-iconv --disable-lzma --disable-sdl2 --disable-everything \ --enable-decoder=aac --enable-decoder=aac_fixed --enable-decoder=aac_latm --enable-decoder=libopus --enable-encoder=aac \ --enable-encoder=opus --enable-encoder=libopus --enable-libopus && - make ${SRS_JOBS} && make install + make ${SRS_JOBS} && make install && cd .. && rm -rf ffmpeg && ln -sf ffmpeg-4.2-fit/_release ffmpeg ) fi diff --git a/trunk/configure b/trunk/configure index 30757bdc3..3b07b394c 100755 --- a/trunk/configure +++ b/trunk/configure @@ -192,6 +192,10 @@ fi if [[ $SRS_GCOV == YES ]]; then SrsLinkOptions="${SrsLinkOptions} ${SrsGcov}"; fi +# For FFMPEG/RTC. +if [[ $SRS_RTC == YES && $SRS_NASM == NO ]]; then + SrsLinkOptions="${SrsLinkOptions} -lrt"; +fi ##################################################################################### # Modules, compile each module, then link to binary diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 3f76b2513..edf2003ab 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -62,6 +62,11 @@ #define __STDC_FORMAT_MACROS #endif +// For RTC/FFMPEG build. +#if defined(SRS_AUTO_RTC) && !defined(__STDC_CONSTANT_MACROS) + #define __STDC_CONSTANT_MACROS +#endif + // For srs-librtmp, @see https://github.com/ossrs/srs/issues/213 #ifndef _WIN32 #include diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index dbb90abd4..02cc62335 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP -#define SRS_VERSION4_REVISION 13 +#define SRS_VERSION4_REVISION 14 #endif