diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 15:55:09 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 15:55:09 +0100 |
| commit | f8e89d8a297e034d03aac88c73acd1541167ae5e (patch) | |
| tree | 036de2728a2748e27d01f273ba431f411eb7b018 /libavformat/rtspdec.c | |
| parent | be5fde92ff6cf920e2e7d58a864dcf5527404564 (diff) | |
| parent | fab8156b2f30666adabe227b3d7712fd193873b1 (diff) | |
Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/rtspdec.c')
| -rw-r--r-- | libavformat/rtspdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index ca7acc806b..a722b98e40 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -296,7 +296,7 @@ static int rtsp_read_setup(AVFormatContext *s, char* host, char *controlurl) av_log(s, AV_LOG_TRACE, "Opening: %s", url); ret = ffurl_open_whitelist(&rtsp_st->rtp_handle, url, AVIO_FLAG_READ_WRITE, &s->interrupt_callback, &opts, - s->protocol_whitelist, s->protocol_blacklist); + s->protocol_whitelist, s->protocol_blacklist, NULL); av_dict_free(&opts); if (ret) localport += 2; @@ -665,7 +665,7 @@ static int rtsp_listen(AVFormatContext *s) if (ret = ffurl_open_whitelist(&rt->rtsp_hd, tcpname, AVIO_FLAG_READ_WRITE, &s->interrupt_callback, NULL, - s->protocol_whitelist, s->protocol_blacklist)) { + s->protocol_whitelist, s->protocol_blacklist, NULL)) { av_log(s, AV_LOG_ERROR, "Unable to open RTSP for listening\n"); return ret; } |