1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00

avformat/hls: fix some cases of HLS streams which require cookies

Broken by commit ba12ba859a. 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 26eb294007)
This commit is contained in:
wm4
2015-09-21 14:43:06 +02:00
committed by Carl Eugen Hoyos
parent 39df4d2475
commit b9841ba98c
+1 -5
View File
@@ -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;
}