diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-28 02:00:50 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-03-24 10:34:19 +0200 |
| commit | fab8156b2f30666adabe227b3d7712fd193873b1 (patch) | |
| tree | 025734e80fdf8862c1769bb039d1d895e1bf82c8 /libavformat/rtspdec.c | |
| parent | 564b4591bbe223bdc5f36a1131eaef103f23f5d0 (diff) | |
| download | ffmpeg-fab8156b2f30666adabe227b3d7712fd193873b1.tar.gz | |
avio: Copy URLContext generic options into child URLContexts
Since all URLContexts have the same AVOptions, such AVOptions
will be applied on the outermost context only and removed from the
dict, while they probably make sense on all contexts.
This makes sure that rw_timeout gets propagated to the innermost
URLContext (to make sure it gets passed to the tcp protocol, when
opening a http connection for instance).
Alternatively, such matching options would be kept in the dict
and only removed after the ffurl_connect call.
Signed-off-by: Martin Storsjö <martin@martin.st>
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 7b6a0258c8..03374dc0e6 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; @@ -667,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; } |