From patchwork Wed May 31 01:29:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Micah Galizia X-Patchwork-Id: 3770 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp75493vsk; Tue, 30 May 2017 18:36:32 -0700 (PDT) X-Received: by 10.223.130.199 with SMTP id 65mr9787966wrc.150.1496194592261; Tue, 30 May 2017 18:36:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496194592; cv=none; d=google.com; s=arc-20160816; b=oVmxKvz+/WhwGvmV8IBZDkoTMoHfAFkxDNFauIy8mdSECCCfOJCoSeEQcZRDni6fcd hww8aG5vLrupgmdbAwOoaRmPwzk2bGRD6fULFXd+wX9DJm2O0D1kE9/6yebZB3nqC06+ U7mpTH7iH9vDro2ny9Y/8+Yjm8beh4gjz22IxzzCaDCR+0/UjNPHZVoSQtCWJh9zGXfR Y8Rjxxu5soQDuoNxZj0fCt5vejwJ0UjJZZmzDcXeVttO0s86BDnLM5mb+Aouhe/9UEvJ pgd+sSkFXA4gYlDypMlQKffRE7kvW6yYMk5lcKPoGKg/vH5bMAc6J7XaKveUg/2VygI/ E4Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=5L4GvZ6VZI/Kbvm+DZ7TNsOK8mw2Ea151Oi+eYCO0Jk=; b=QAEkC2PesGfK+eR2Bo2WhDpcW9soIvAkyUxirk5gvfWLagO/g6x82ZmO1FG7R8xWC5 Rmdwd4xcPpf5PNOTsNaUT7jewzawfFX+yn3jRfZrNHG79+HXk0P7D5/tsGb1o/R8Kg3U UAJHI6Nym/YCR+81PBMEvSaBGWnk95BBDJMOM1F5UJ8BN6zqCdXdil+FA/nsmk3P9ebT 3N5STMCZl5mxg6tn+J+ogBaZWM0NJdptvirdtj/MVonAdWr4im9ZQj3N9Lbf/E39BKnF 7hSWRtw7eTtM/awPKaJfkjLpinWXLIF+jxW8I4/tMaotqctDmQ2ZPq89UKvpmQnu0Tky 5EQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 43si16145504wrx.326.2017.05.30.18.36.31; Tue, 30 May 2017 18:36:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B77DD689207; Wed, 31 May 2017 04:36:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DA06688395 for ; Wed, 31 May 2017 04:36:18 +0300 (EEST) Received: by mail-it0-f66.google.com with SMTP id 67so578688itx.2 for ; Tue, 30 May 2017 18:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xB6YXxAYctitlplFlQRLFmWEMiRWa9r1sJA3HRdoXvU=; b=mxsiULXWIWmQwlC3psvHt9ORAmxjOLpghI7doddVJ4eMrpSF3h2fCv1P+wa/xeGDNq 79m2Dc9tfTegvYwS710IsoBlE7x9m0y/Lw4gthIV5jGgLF4iqc7stouzEuvoj93pOgvw LkcS0fVyQe5gjGEodSW9IOsWhaUUEpTP0B7UYmKCgi3/MnmrVyW5RdMWdEhhTTDktwA1 S5ebbNigxUZzAy8WR1ztOGK2J744lZZW637ymIvfPDAlGgSxRyiZuCVn6IDVW5jPjHHA KZWFWRzHBQL0Kbmgh7H1C7ARffrNgeZS8DRBTA7Ph9gco+Vl0zsJZmOpAjv+gt1upJw5 0+GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xB6YXxAYctitlplFlQRLFmWEMiRWa9r1sJA3HRdoXvU=; b=HXB0dJPU2H7GvYT7U2J+zax0Km7odGVATfEfgHdjChE/cMqM/O/X7MtGpGzZxy0PX1 mLOp41Q7y26zZcgr7vynjZPXeOHtcZQsYcOCvG3Depc6gU8gSUvS7vZ1sJicjKDDJ5kS q62ItXCmFR64iCMb2E65iIZ4i9HSi6DSiG9Dg3NyGr2PL3DC7BXA9Yw8DPKuZFfUD1Su I+on6hvZnmoeOI1C4sDFYiroM+ZPRH4Kuefxv3Y4AR1raRjz3QmNKa9q1Nu6ynKYY5S1 iU543RvsdtVn3i1rKuVdgWZGytSkWCxNKv+DlFt4N0n7JlkWHJWFqe/g00yzdBUGsKKj 0BZw== X-Gm-Message-State: AODbwcD1KaR0J8/inZxuhvxOCHtXPgPUcT82es6Tpn/e4dZPLdek1FhF lpdvQJe4veeDy9dY X-Received: by 10.36.24.4 with SMTP id 4mr5282336itr.6.1496194213349; Tue, 30 May 2017 18:30:13 -0700 (PDT) Received: from localhost.localdomain (dhcp-108-168-3-172.cable.user.start.ca. [108.168.3.172]) by smtp.gmail.com with ESMTPSA id k79sm10463407itk.26.2017.05.30.18.30.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 May 2017 18:30:12 -0700 (PDT) From: Micah Galizia To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 May 2017 21:29:55 -0400 Message-Id: <20170531012955.4094-3-micahgalizia@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170531012955.4094-1-micahgalizia@gmail.com> References: <20170531012955.4094-1-micahgalizia@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] libavformat/hls: Observe Set-Cookie headers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Michael Niedermayer , Micah Galizia MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Micah Galizia Signed-off-by: Michael Niedermayer (cherry picked from commit c4c73020f4bbf261f0b263be82de575c17fa5a60) Signed-off-by: Micah Galizia --- libavformat/hls.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index bac53a4350..42022690f1 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -630,8 +630,16 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp); if (ret >= 0) { // update cookies on http response with setcookies. - void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb; - update_options(&c->cookies, "cookies", u); + char *new_cookies = NULL; + + if (!(s->flags & AVFMT_FLAG_CUSTOM_IO)) + av_opt_get(*pb, "cookies", AV_OPT_SEARCH_CHILDREN, (uint8_t**)&new_cookies); + + if (new_cookies) { + av_free(c->cookies); + c->cookies = new_cookies; + } + av_dict_set(&opts, "cookies", c->cookies, 0); }