[FFmpeg-cvslog] avformat/hls: fix some cases of HLS streams which require cookies

[wm4]

ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Mon Sep 21 14:43:06 2015 +0200| [26eb2940079d0ec433cf9b2deae24560707cbcf8] | committer: wm4

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26eb2940079d0ec433cf9b2deae24560707cbcf8
---

 libavformat/hls.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index c16c770..6df95d4 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;
 }