Skip to content

Commit e49d57e

Browse files
committed
Merge remote-tracking branch 'origin/master' into queue-buffers-when-auto-demand-is-low
2 parents 4188729 + 1cba1b9 commit e49d57e

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

README.md

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
[![API Docs](https://img.shields.io/badge/api-docs-yellow.svg?style=flat)](https://hexdocs.pm/membrane_core/)
55
[![CircleCI](https://circleci.com/gh/membraneframework/membrane_core.svg?style=svg)](https://circleci.com/gh/membraneframework/membrane_core)
66

7-
### []() Let's meet on 13th October at [RTC.ON](https://rtcon.live) - the first conference about Membrane & multimedia!
8-
### []() Learn more at [rtcon.live](https://rtcon.live)
9-
10-
---
11-
127
Membrane is a versatile multimedia streaming & processing framework. You can use it to build a media server of your need, that can:
138
- stream via WebRTC, RTSP, RTMP, HLS, HTTP and other protocols,
149
- transcode, mix and apply custom processing of video & audio,

0 commit comments

Comments
 (0)