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>
This commit is contained in:
parent
564b4591bb
commit
fab8156b2f
21 changed files with 37 additions and 32 deletions
|
@ -265,7 +265,7 @@ static int rtmpe_open(URLContext *h, const char *uri, int flags)
|
|||
|
||||
/* open the tcp or ffrtmphttp connection */
|
||||
if ((ret = ffurl_open(&rt->stream, url, AVIO_FLAG_READ_WRITE,
|
||||
&h->interrupt_callback, NULL, h->protocols)) < 0) {
|
||||
&h->interrupt_callback, NULL, h->protocols, h)) < 0) {
|
||||
rtmpe_close(h);
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue