X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtspdec.c;h=03374dc0e619a594f1375d63bedb2bbc88c32477;hb=2f806622e1270d3ed1d41a53049a19673dafbe70;hp=c6f4d521e43c427fbe97d5bb84751cdf007a4b1d;hpb=8c0ceafb0f25da077ff23e394667119f031574fd;p=ffmpeg diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index c6f4d521e43..03374dc0e61 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -295,7 +295,7 @@ static int rtsp_read_setup(AVFormatContext *s, char* host, char *controlurl) ff_url_join(url, sizeof(url), "rtp", NULL, host, localport, NULL); av_log(s, AV_LOG_TRACE, "Opening: %s", url); ret = ffurl_open(&rtsp_st->rtp_handle, url, AVIO_FLAG_READ_WRITE, - &s->interrupt_callback, &opts, rt->protocols); + &s->interrupt_callback, &opts, rt->protocols, NULL); av_dict_free(&opts); if (ret) localport += 2; @@ -640,7 +640,8 @@ static int rtsp_listen(AVFormatContext *s) enum RTSPMethod methodcode; if (!rt->protocols) { - rt->protocols = ffurl_get_protocols(NULL, NULL); + rt->protocols = ffurl_get_protocols(s->protocol_whitelist, + s->protocol_blacklist); if (!rt->protocols) return AVERROR(ENOMEM); } @@ -666,7 +667,7 @@ static int rtsp_listen(AVFormatContext *s) "?listen&listen_timeout=%d", rt->initial_timeout * 1000); if (ret = ffurl_open(&rt->rtsp_hd, tcpname, AVIO_FLAG_READ_WRITE, - &s->interrupt_callback, NULL, rt->protocols)) { + &s->interrupt_callback, NULL, rt->protocols, NULL)) { av_log(s, AV_LOG_ERROR, "Unable to open RTSP for listening\n"); return ret; }