Merge branch 'v3' into make-subchannels-be-ordered

# Conflicts: # CHANGELOG.md
versatica · Dec 12, 2023 · 9cc77d5 · 9cc77d5
2 parents be42f16 + 042b7f5
commit 9cc77d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@
 
 ### NEXT
 
-* liburing: avoid extra memcpy on RTP ([PR #1258](https://github.com/versatica/mediasoup/pull/1258)).
+* liburing: >void extra memcpy on RTP ([PR #1258](https://github.com/versatica/mediasoup/pull/1258)).
+* libsrtp: Use our own fork ([PR #1260](https://github.com/versatica/mediasoup/pull/1260)).
 * Make subchannels be ordered ([PR #1261](https://github.com/versatica/mediasoup/pull/1261)).
 
 

diff --git a/worker/subprojects/libsrtp2.wrap b/worker/subprojects/libsrtp2.wrap
@@ -1,9 +1,8 @@
 [wrap-file]
-directory = libsrtp-2.5.0
-source_url = https://github.com/cisco/libsrtp/archive/refs/tags/v2.5.0.tar.gz
-source_filename = libsrtp-2.5.0.tar.gz
-source_hash = 8a43ef8e9ae2b665292591af62aa1a4ae41e468b6d98d8258f91478735da4e09
-wrapdb_version = 2.5.0-1
+directory = libsrtp-4c9f0956f2933ac0650208d69c8d897625ba6301
+source_url = https://github.com/versatica/libsrtp/archive/4c9f0956f2933ac0650208d69c8d897625ba6301.zip
+source_filename = libsrtp-4c9f0956f2933ac0650208d69c8d897625ba6301.zip
+source_hash = 4f3af61e26df398569605fc4bcf377587ca2d8bd34b2b4bf9cdb9590cadbd662
 
 [provide]
 libsrtp2 = libsrtp2_dep