avformat/hls: fix some cases of HLS streams which require cookies
authorwm4 <nfxjfg@googlemail.com>
Mon, 21 Sep 2015 12:43:06 +0000 (14:43 +0200)
committerwm4 <nfxjfg@googlemail.com>
Tue, 22 Sep 2015 15:41:01 +0000 (17:41 +0200)
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.

libavformat/hls.c

index c16c770..6df95d4 100644 (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;
 }