Skip to content

Commit eddb767

Browse files
committed
Merge remote-tracking branch 'origin/master' into release/v0.24.0
2 parents be27b86 + cdfc040 commit eddb767

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The package can be installed by adding `membrane_rtp_plugin` to your list of dep
1616
def deps do
1717
[
1818
{:membrane_rtp_plugin, "~> 0.24.0"},
19-
{:ex_libsrtp, "~> 0.6.0"} # required only if SRTP/SRTCP support is needed
19+
{:ex_libsrtp, ">= 0.0.0"} # required only if SRTP/SRTCP support is needed
2020
]
2121
end
2222
```

mix.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ defmodule Membrane.RTP.Plugin.MixProject do
4040
{:membrane_rtp_format, "~> 0.8.0"},
4141
{:membrane_funnel_plugin, "~> 0.9.0"},
4242
{:membrane_telemetry_metrics, "~> 0.1.0"},
43-
{:ex_libsrtp, "~> 0.6.0", optional: true},
43+
{:ex_libsrtp, "~> 0.6.0 or ~> 0.7.0", optional: true},
4444
{:qex, "~> 0.5.1"},
4545
{:bunch, "~> 1.5"},
4646
{:heap, "~> 2.0.2"},

mix.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"earmark_parser": {:hex, :earmark_parser, "1.4.38", "b42252eddf63bda05554ba8be93a1262dc0920c721f1aaf989f5de0f73a2e367", [:mix], [], "hexpm", "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6"},
1313
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
1414
"ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"},
15-
"ex_libsrtp": {:hex, :ex_libsrtp, "0.6.0", "d96cd7fc1780157614f0bf47d31587e5eab953b43067f4885849f8177ec452a9", [:mix], [{:bunch, "~> 1.3", [hex: :bunch, repo: "hexpm", optional: false]}, {:unifex, "~> 1.0", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "e9ce8a507a658f7e2df72fae82a4b3ba0a056c175f0bc490e79ab03058e094d5"},
15+
"ex_libsrtp": {:hex, :ex_libsrtp, "0.7.0", "af57cabeb9ae2a39fbfb7e6afc7ce18a90e0b39912cd95aabf598817d2297cbc", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:bundlex, "~> 1.2", [hex: :bundlex, repo: "hexpm", optional: false]}, {:unifex, "~> 1.1", [hex: :unifex, repo: "hexpm", optional: false]}], "hexpm", "5cf1693472b8eadea460c53178d456806d01e7f116fe80cf974325d924d88697"},
1616
"ex_pcap": {:git, "https://github.com/membraneframework/expcap.git", "07c5bfa25280ea6a28d022d3a206ececf9b9913a", []},
1717
"file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
1818
"finch": {:hex, :finch, "0.16.0", "40733f02c89f94a112518071c0a91fe86069560f5dbdb39f9150042f44dcfb1a", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "f660174c4d519e5fec629016054d60edd822cdfe2b7270836739ac2f97735ec5"},

0 commit comments

Comments
 (0)