mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'
* commit 'd44f3e4059506a182f59218b1e967d42b01e097c': avio: Apply avoptions on the URLContext itself as well Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
4eef36a4f6
|
@ -311,6 +311,9 @@ int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags,
|
||||||
int ret = ffurl_alloc(puc, filename, flags, int_cb);
|
int ret = ffurl_alloc(puc, filename, flags, int_cb);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
if (options &&
|
||||||
|
(ret = av_opt_set_dict(*puc, options)) < 0)
|
||||||
|
goto fail;
|
||||||
if (options && (*puc)->prot->priv_data_class &&
|
if (options && (*puc)->prot->priv_data_class &&
|
||||||
(ret = av_opt_set_dict((*puc)->priv_data, options)) < 0)
|
(ret = av_opt_set_dict((*puc)->priv_data, options)) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
Loading…
Reference in New Issue