diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-02-03 01:01:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-05 16:18:49 +0200 |
| commit | a16018461b2f5c652b246a9aed1ab04623e96470 (patch) | |
| tree | 7fd6ec79863f029090b69ce2e620227a51718894 /libavformat/rtsp.c | |
| parent | 04a8bbca9289a4ee203f90bb8d48166bf53015e6 (diff) | |
| download | ffmpeg-a16018461b2f5c652b246a9aed1ab04623e96470.tar.gz | |
lavf: forward protocol_whitelist for the remaining cases
Also set a default_whitelist for mmsh and ffrtmphttp.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 21c80c1cb0..15e1ab8395 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1752,6 +1752,14 @@ redirect: sessioncookie); av_opt_set(rt->rtsp_hd->priv_data, "headers", headers, 0); + if (!rt->rtsp_hd->protocol_whitelist && s->protocol_whitelist) { + rt->rtsp_hd->protocol_whitelist = av_strdup(s->protocol_whitelist); + if (!rt->rtsp_hd->protocol_whitelist) { + err = AVERROR(ENOMEM); + goto fail; + } + } + /* complete the connection */ if (ffurl_connect(rt->rtsp_hd, NULL)) { err = AVERROR(EIO); |