From patchwork Tue Dec 17 00:45:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 16844 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 29E40449955 for ; Tue, 17 Dec 2019 02:45:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C0DE68AED3; Tue, 17 Dec 2019 02:45:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDCE168AD9A for ; Tue, 17 Dec 2019 02:45:09 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id c14so9448982wrn.7 for ; Mon, 16 Dec 2019 16:45:09 -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=p8uy8aogMzWdDGhnk7H/BErqEr6QLTIXdPB4AEEw4+s=; b=K2ZzFzXtOBhpoHSWPZrxeyHCfCa6eQc18enRHIv6oZPr0EhBeBnP7nKi9O8GWia/Hb RxeBbnwMlp/8BJUFPBle3gDQNIPKqu4cB6qP0sigjHs7pTqyQmbTOx1oWfZbfpDxp50x imEpVkEe+sbYUja81wL8Lf/dEkw9t0WIHw4L/Yz/8ehz4gwUiNMejO6HavsDsqbPI/gd e0b2sqsY5Q27emnX99io1X6cqFa8yTAck4n3rKtjhOn4O8udmubfCSjSP2DJQloGdI8J iBaFupHErGgTgR2c60DaeTjKBsZwWihgionFNxA7f7fu1cEm2EfMbOQ0Ji0SsjP9Mr/o Tq3w== 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=p8uy8aogMzWdDGhnk7H/BErqEr6QLTIXdPB4AEEw4+s=; b=UI5DAkeDY60Ipms2ycjdHZZsPxC5zC7ScKRqMjF57K6FtU7MwsIonZSNjva0cV2uzY twvnYrlonIIvWOPAenkXG4lETdQOTIIMqe3+QWjREmEd040X/urkovm7BNpHVr8VzA/o G5N/jtqDQPy6kRfHFgUH6/1TW4wgc/ePHqnv4YwVgBTA84O8NR6hfg0JppqHbg7GDixG ktHYADGmr5xOZ9cadcws2t/L5heNUsKj4aFiPZztcVhgdMVB2angK0dwiW+RWJmKu6wT mEXMqa4nmHpnMusPKy12eCEy7kXOK+LeEDkg7KiL+Z9k3DGNX1o1VIvypodND+R3cWhd aq2Q== X-Gm-Message-State: APjAAAUDgXdFN87qVJ8oOTaP8TM009omoSlMkiZHZ5Ahhb69kq+fxE3M Mv3oO2DXdS1dOetjDr8oe399zk6F X-Google-Smtp-Source: APXvYqwdMjlFT1tbLrEZHVXgvuXPj3gtWcg3G8v5TFw3sDcwo/DkKaudxiv/icriXiJp7XC4SJDNvw== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr32509251wrt.208.1576543509214; Mon, 16 Dec 2019 16:45: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 s1sm1142000wmc.23.2019.12.16.16.45.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 16:45:08 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Dec 2019 01:45:04 +0100 Message-Id: <20191217004504.29011-1-epirat07@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/dashdec: 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/dashdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 72ba9605f0..15e79fd51a 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1851,7 +1851,7 @@ static int save_avio_options(AVFormatContext *s) { DASHContext *c = s->priv_data; const char *opts[] = { - "headers", "user_agent", "cookies", "http_proxy", "referer", "rw_timeout", NULL }; + "headers", "user_agent", "cookies", "http_proxy", "referer", "rw_timeout", "icy", NULL }; const char **opt = opts; uint8_t *buf = NULL; int ret = 0;