Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiongziliang 2019-04-22 11:20:35 +08:00
commit 846c25b525

View File

@ -70,7 +70,7 @@
| RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | N | Y | N | | RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | N | Y | N |
| RTMP --> RTSP[S] | Y | N | Y | N | | RTMP --> RTSP[S] | Y | N | Y | N |
| RTSP[S] --> HLS | Y | Y | Y | N | | RTSP[S] --> HLS | Y | Y | Y | N |
| RTMP --> HLS | Y | Y | Y | N | | RTMP --> HLS | Y | N | Y | N |
| RTSP[S] --> MP4 | Y | N | Y | N | | RTSP[S] --> MP4 | Y | N | Y | N |
| RTMP --> MP4 | Y | N | Y | N | | RTMP --> MP4 | Y | N | Y | N |
| MP4 --> RTSP[S] | Y | N | Y | N | | MP4 --> RTSP[S] | Y | N | Y | N |