[FFmpeg-cvslog] avformat/srtpproto: pass options to nested protocol

[Kacper Michajłow]

ffmpeg | branch: master | Kacper Michajłow <kasper93 at gmail.com> | Fri May 10 03:49:02 2024 +0200| [8485f7a3784b545eea521ecd1aac9c4115e5a936] | committer: Michael Niedermayer

avformat/srtpproto: pass options to nested protocol

This fixes passing options dict.

Fixes some timeouts found by OSS-Fuzz.

Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8485f7a3784b545eea521ecd1aac9c4115e5a936
---

 libavformat/srtpproto.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/srtpproto.c b/libavformat/srtpproto.c
index 61669e05ad..02cf156327 100644
--- a/libavformat/srtpproto.c
+++ b/libavformat/srtpproto.c
@@ -61,7 +61,7 @@ static int srtp_close(URLContext *h)
     return 0;
 }
 
-static int srtp_open(URLContext *h, const char *uri, int flags)
+static int srtp_open(URLContext *h, const char *uri, int flags, AVDictionary **options)
 {
     SRTPProtoContext *s = h->priv_data;
     char hostname[256], buf[1024], path[1024];
@@ -78,7 +78,7 @@ static int srtp_open(URLContext *h, const char *uri, int flags)
                  path, sizeof(path), uri);
     ff_url_join(buf, sizeof(buf), "rtp", NULL, hostname, rtp_port, "%s", path);
     if ((ret = ffurl_open_whitelist(&s->rtp_hd, buf, flags, &h->interrupt_callback,
-                                    NULL, h->protocol_whitelist, h->protocol_blacklist, h)) < 0)
+                                    options, h->protocol_whitelist, h->protocol_blacklist, h)) < 0)
         goto fail;
 
     h->max_packet_size = FFMIN(s->rtp_hd->max_packet_size,
@@ -131,7 +131,7 @@ static int srtp_get_multi_file_handle(URLContext *h, int **handles,
 
 const URLProtocol ff_srtp_protocol = {
     .name                      = "srtp",
-    .url_open                  = srtp_open,
+    .url_open2                 = srtp_open,
     .url_read                  = srtp_read,
     .url_write                 = srtp_write,
     .url_close                 = srtp_close,