From patchwork Tue Dec 17 00:17:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 16845 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 68BFF4488E3 for ; Tue, 17 Dec 2019 02:48:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E4B168AEFA; Tue, 17 Dec 2019 02:48:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3737E687FD1 for ; Tue, 17 Dec 2019 02:47:54 +0200 (EET) Received: by mail-ed1-f67.google.com with SMTP id f8so6638746edv.2 for ; Mon, 16 Dec 2019 16:47:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bb6gkUhy1CZnVoT5VHxFt5DTRe+xOJgYOIxNmQpPgg8=; b=cv5fG8MNHG7UpLwasOk3aSajS+S4WRUacTT+td12Ng/SgdnMarTBSiGDXJBw4IeiqN XooOQa56DuWLkSjxYdnDrPIn53ZC1BStZ31exU/GGWlqLEquAXZqsORqH0EdNF10QKgD 3sQ1KsBtAOEh25x1gAf1wFi4odby+6WMKc4yAol3YLPrwtD7hLUxmMtt58hVIgyZRWc9 IHmw85ntBXJBKHb0rJmZ/y2Kp1ZKh2uO1tEv2chJ37xbahaWYSGo6/Z6mJC7NyiGaz65 aPQLTGTZxbCuNFVpcI1ydOR6KUMV4UMR48XbUHJ9KEMwuhdlG2U64NtyOf+NkvUj0uRg 3Llw== 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:mime-version :content-transfer-encoding; bh=bb6gkUhy1CZnVoT5VHxFt5DTRe+xOJgYOIxNmQpPgg8=; b=mvqx8vc/oWo6pBCeq11zf1iWX7/Ri+2HRAW++akTC2+LFiBMgBBgB038QV5mnngz13 PcM36lqAskFVEEtbNLH20JaRZg5KLm5FoWphjrP/IGYoxwF1lV9D2FCyjpu/ITjN6ZPk jOJBwkgqjpjHTFWMnjxaSfLnZhjyStld/eazuKdyz4ZzkoBPr/tG6rnbHS8Ltys8AGUj +cXA7QEzKILRNz91GOyAOWR2FsFLPbxqF1z7xDuW+hbgh55tNVm5aaHRhrJZbx22eISK cBpAjEQWcji0g2L+8XvQnN0AdU72FXdP12aOuYArIsHR86HolKFpcdGJYuDD2o0vSfvw j+rw== X-Gm-Message-State: APjAAAWLoJcYyPWmVtoj81D6vVLkBaOGqjD/DZJxYzSif5yrOtaMINaU q9exP5uVj5nUqRQZ9cpKvv5b1tai X-Google-Smtp-Source: APXvYqxEBTwfPmzEz041c+TOjoHlY9fLk+K++DWqnmpIa5z/5j8r/Me9WX1pLcGE3ITJp6y4IhHB+A== X-Received: by 2002:a5d:6406:: with SMTP id z6mr31648028wru.294.1576541889863; Mon, 16 Dec 2019 16:18:09 -0800 (PST) Received: from Marvins-MBP.fritz.box (p3E9D46A0.dip0.t-ipconnect.de. [62.157.70.160]) by smtp.gmail.com with ESMTPSA id m7sm23184467wrr.40.2019.12.16.16.18.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 16:18:09 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Dec 2019 01:17:42 +0100 Message-Id: <20191217001742.15262-1-epirat07@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hls: propagate icy to child AVIOContexts 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When the user decides they do not want to to send the Icy-MetaData header, this should be respected for all requests, not just the first one. Fix #5578 --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 21353bbad7..4b1bb964ae 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1663,7 +1663,7 @@ static int save_avio_options(AVFormatContext *s) { HLSContext *c = s->priv_data; static const char * const opts[] = { - "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL }; + "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", "icy", NULL }; const char * const * opt = opts; uint8_t *buf; int ret = 0;