From patchwork Thu Jun 1 19:43:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kacper Michajlow X-Patchwork-Id: 41938 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp722171pzb; Thu, 1 Jun 2023 12:44:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5YkvbZVwzlGTctZXDGVRJugIo9Cvqq84K1Kcxyg6jLtGDRBvPtKcZqt5RBROe6QuyhwrvC X-Received: by 2002:a17:907:9811:b0:94f:6d10:ad9f with SMTP id ji17-20020a170907981100b0094f6d10ad9fmr2014317ejc.42.1685648661114; Thu, 01 Jun 2023 12:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685648661; cv=none; d=google.com; s=arc-20160816; b=rkKiJXGadG5ZdxMD7LjIdAEgK7PihLFP7O4R6RB6/RnNayOoXpIrX1HUqgQ4Vcc5fe maRDicl1oIp3miUB+QZjiPjESE7gXKSQnJIXaP+bWnUccJo+PZtbTZfI86hab52hsZSU belDT0iTp/hzuw/RtwvFRudUlFyCzDGtfp6SMsgvNT5VAzkIGSTwXeR1n6m8KWriRBMQ urJUR0TimvsSdBLHyMiuuy83JRHSE1jXddtid+77PWwfdLKRkb2JE2xYoFr13N2Gbb82 EB5D6QoPClJNmnhHk1lnWsMFIIXKUREw/UR+hdu+2+18iLDdyTt3LmXStqYVb6MQBHRz z/wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Lz4PIz0+XryE6xuUhFqp06lE/SUCUcvdabDbSzLCa5A=; b=e7xB7UoKlDPqGz8YK8P2qx2S8TpIszQoqaLuvSG6c4V64m1F/L2yRxJlH5wUd3WdME n9NKsV1Ee0GECzlReBshBPcAwp9UzAFl4pSGbBfTZ/s+NoEe5co82OJCEfJROGUXnbFR 4MAKERsSZO2KKVb7LmAULeFS4lZD5BxTmoRHMbL8GoXstdHn3YoNOWI7vysl6fgMvIfW UivSVyYuDQ2BT1GUE3klXyJYOcViuIg1DsFARANOq3ApAwroFmBNKYrDH34A+x8b4ieE e89YoBwjvlusZdW8QELs46OCrbinC1ZUAm5jSFGFNtIDR8g7sfoRFqP1TtnrRwhZTjC0 slsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=HuRGefK1; 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=QUARANTINE 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 ko22-20020a170907987600b00973a9c38605si1631653ejc.451.2023.06.01.12.44.20; Thu, 01 Jun 2023 12:44:21 -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 header.s=20221208 header.b=HuRGefK1; 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=QUARANTINE 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 967CF68C2A9; Thu, 1 Jun 2023 22:44:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3A9368BF65 for ; Thu, 1 Jun 2023 22:44:09 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-96f50e26b8bso188048866b.2 for ; Thu, 01 Jun 2023 12:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685648649; x=1688240649; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fjKW0O2W1SiI4EVcJWZcn4Q/5gvUHOpX7vnhzZDzz6Q=; b=HuRGefK1r2yKDAvY2K9tdOP7TxGYnHop4H1Ufu55l9G529tmumdxg5m+PYHws7PZu9 luX+GuppCDW/pYxByHoHjgjNif0byr8LH7HUlpUhcPQMvhezbcko02yhFwy6ZM6V/Qm3 ux0M/rBh8tEBdRnUIpPq7hHa0x3SqK+TnDv5d7ExyHOp6wZSpvjXiRUjPMGZgkZXfJ3e V/hf5tf+ZxfnUGD0U+nzRDjLPk6lb7D6QNHeOhI+6KbEXAtoBmXuMEX34EE12nZdAXBR JBJwHpBadvBovPJzwuQnC5a7nAdOg0r7hGHQhlY2gsSw4hL8soav+uNtaRqTGehrITPC tkPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685648649; x=1688240649; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fjKW0O2W1SiI4EVcJWZcn4Q/5gvUHOpX7vnhzZDzz6Q=; b=MCjXiIVYTu6jnY1lMwQ+o9SH7o+CGNleVVGbmsQ+4PGsrbv/CrMh17bBKHb1AhU9/q qe+jy2fykKX8jfYq4/JI90Z/1+aLfksO6Y9pZUTKp6dDmraHaTdk9eC5Eic08ow/1sLW 4xryoNiqVkPy1nWJh/HVm0b+E8DqJ85eirOznC4p0S0Z42PmY0QvBCsCmPh0ItgvY+v4 +MBiunp01hhHmG97xeciytWebX56vwDrLxJui8W8nvzVfAgxs5BaEfe8E0US4uaoZXZR v2924FfU13BDJs0T7wcReUsfYWyAYMYuO0h3Ipx79Ss6Xu/5a3E7o/fCLgOUv2qh0zdi 8FIQ== X-Gm-Message-State: AC+VfDxTHak2AbiU9wv4kbf2MbC4A3t1cvugYEF71T5u/XxbgNywprFw KDDWbOpp6Fnx0Fsl4VOxOaV9084zdJA= X-Received: by 2002:a17:907:7b89:b0:974:5ce6:f9f6 with SMTP id ne9-20020a1709077b8900b009745ce6f9f6mr469371ejc.10.1685648648745; Thu, 01 Jun 2023 12:44:08 -0700 (PDT) Received: from localhost.localdomain (89-74-109-154.dynamic.chello.pl. [89.74.109.154]) by smtp.gmail.com with ESMTPSA id x19-20020a1709064a9300b0096616adc0d5sm10892354eju.104.2023.06.01.12.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 12:44:08 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Jun 2023 21:43:47 +0200 Message-Id: <20230601194347.1162-1-kasper93@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: =?utf-8?q?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RTDtt7AksjdH Content-Type can include charset and boundary which is not a part of mime type and shouldn't be copied as such. Fixes HLS playback when the Content-Type includes additional fields. Signed-off-by: Kacper Michajłow --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 0817aafb5b..fd931c2d8e 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1205,7 +1205,7 @@ static int process_line(URLContext *h, char *line, int line_count) } } else if (!av_strcasecmp(tag, "Content-Type")) { av_free(s->mime_type); - s->mime_type = av_strdup(p); + s->mime_type = av_get_token((const char **)&p, ";"); } else if (!av_strcasecmp(tag, "Set-Cookie")) { if (parse_cookie(s, p, &s->cookie_dict)) av_log(h, AV_LOG_WARNING, "Unable to parse '%s'\n", p);