diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-09-21 14:43:06 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-09 21:14:23 +0200 |
| commit | b9841ba98c00d6398a4ff74a0c24d5d398c4ae25 (patch) | |
| tree | 25c156ee4f9165e3343d65170b388a4a202a4284 | |
| parent | 39df4d24751d89af749e79f5839b341ad7931751 (diff) | |
| download | ffmpeg-b9841ba98c00d6398a4ff74a0c24d5d398c4ae25.tar.gz | |
avformat/hls: fix some cases of HLS streams which require cookies
Broken by commit ba12ba859aabfa7153ba397d869db13acdaba340. This only
happens with HLS streams which use encryption and require preserving
cookies sent by the server.
Fixes trac issue #4846.
(cherry picked from commit 26eb2940079d0ec433cf9b2deae24560707cbcf8)
| -rw-r--r-- | libavformat/hls.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index c16c7708f4..6df95d4041 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -516,15 +516,11 @@ static int url_connect(struct playlist *pls, AVDictionary *opts, AVDictionary *o av_dict_copy(&tmp, opts, 0); av_dict_copy(&tmp, opts2, 0); - if ((ret = av_opt_set_dict(pls->input, &tmp)) < 0) - goto fail; - - if ((ret = ffurl_connect(pls->input, NULL)) < 0) { + if ((ret = ffurl_connect(pls->input, &tmp)) < 0) { ffurl_close(pls->input); pls->input = NULL; } -fail: av_dict_free(&tmp); return ret; } |