diff --git a/trunk/conf/docker.conf b/trunk/conf/docker.conf index 58a200442f..dc7a2368b5 100644 --- a/trunk/conf/docker.conf +++ b/trunk/conf/docker.conf @@ -31,8 +31,8 @@ vhost __defaultVhost__ { rtc { enabled on; # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc - rtmp_to_rtc off; + rtmp_to_rtc on; # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp - rtc_to_rtmp off; + rtc_to_rtmp on; } } diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 636ae02e9d..a9a70bd708 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -9,6 +9,7 @@ The changelog for SRS. ## SRS 4.0 Changelog * v4.0, 2022-01-17, Release v4.0-b4, 4.0 beta4, v4.0.230, 144393 lines. +* v4.0, 2022-01-17, Enable rtmp2rtc and rtc2rtmp for docker.conf * v4.0, 2022-01-17, Support docker image for [droplet](https://hub.docker.com/r/ossrs/droplet). v4.0.230 * v4.0, 2022-01-16, Update README for **Cloud Virtual Machine([CN](https://github.com/ossrs/srs/wiki/v4_CN_Home#cloud-virtual-machine) / [EN](https://github.com/ossrs/srs/wiki/v4_EN_Home#cloud-virtual-machine))** * v4.0, 2022-01-13, Merge [#2872](https://github.com/ossrs/srs/pull/2872): RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229