From patchwork Sat Apr 28 18:37:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 8687 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1940807jad; Sat, 28 Apr 2018 11:36:59 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoUmxY1L4bAAaF6roYAblcNpgQwN5rVnPkrYqMgoGvUwoeghMJzLtghxxAnrHsU0XAVbE+r X-Received: by 10.28.160.26 with SMTP id j26mr3715801wme.74.1524940619735; Sat, 28 Apr 2018 11:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524940619; cv=none; d=google.com; s=arc-20160816; b=Srs+FCgn0JScTLVtgVKeur53YpWqdoPoWR26k0r8QCqEgkkCIC+scpqVJEgiRrIoqi uSGIz6XtfpKhjCFeOETSfsN+bNfbPQFGkDEfgqMlRQwOqIea/Lzl2N5011BwgNQEMTMB TeOBcUEDMwaYKDgMy3hyXJaL3kjNqm5S2Ym1pnLGYzKf8WuJbttohpGq09XTaCu8MqBd CF1MakfoePrtZEZXzPqMtWnJm9QeChc+kH7hc7UDfF5+AJk+00xrB0rxhm+uYARgGX7c +kiRuvAMhvPqXnWXMNkTzlqY4KNURieUVwE2I8JsA9QjaC5mnS8FpYsGxIA2OeJTN3eh ving== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=d1G17pbtJ/mPCWvUSpQNJWffKwfp+WOh2SAy3Gfze/k=; b=pdQYXIw5f2xFxVqnKOUaVWcXCwIX4Mm+DWe5q9GeNna33NiKoqzuI43NyVICJbQAAA GECuPf3eAhy1NFPelH0jV9x85SIOoBgWdhB0WRNglqevURj3uCKOWdJyZD//44lhuVJN SAFOnXKyp0I+yIRv2xrfZjhbVrO0O2ZDfODT+sBvfiGZyZsQv2Gs7Dxir28sYRJJmMcJ NkFlpufc+IoL0qv+rc1otOjajHvNndBpu1bhXAh1TNwMo2zEbJZthTdAtp4xkLvi8Gg1 +Zfh/qK+HnHQ7xiGi1cWZqKYb9ibzvJqbARwFd0eFrZ6ShAXm5ZECU/bneXtnvBV/qRw 0pjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=IY4Evl7v; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v189si2796235wma.96.2018.04.28.11.36.59; Sat, 28 Apr 2018 11:36:59 -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=@googlemail.com header.s=20161025 header.b=IY4Evl7v; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 674A368A584; Sat, 28 Apr 2018 21:36:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE79068A51F for ; Sat, 28 Apr 2018 21:36:19 +0300 (EEST) Received: by mail-wm0-f49.google.com with SMTP id n10so8116069wmc.1 for ; Sat, 28 Apr 2018 11:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=AVQ0qHehDcdnye9MhUeV3AgNAAXQwnCQ2bj11+d9558=; b=IY4Evl7vFg8ONBA/CzmTVA+pIiAtTLtJ+K7ceDd7gULI451rL+VhDOc+vCx1zoc0rg 9WMk0FpltJ1Jgn1St7t4N8SWY5j0TPpYncjtOrxH5sEKqCZwS/dRin+e74suhVehXZSK 0UDSFsRGCW6MFhu5bdXtKHRHZBAzpNFAp72PizDwbD/+QOanYej0bz2fSqtyhMG55L30 4urc1jv3XNmvjoSH6nT1G10QL6nriDi9+lvwxHgZveM21xrjsPz0D1nyZAsw/GtsVxK4 vsnq99HKefV1NmYRGMIMbKgJj4OYj18Ism+nXglVw92HytEMYsV3awrO59xDNta7Dbyr YjIA== 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; bh=AVQ0qHehDcdnye9MhUeV3AgNAAXQwnCQ2bj11+d9558=; b=ZfOjiErdmuSliGSQlk21Vn2dgVvPN9jiNKkpgcRNBsk7Ki/290WJlIbB5Kd6IHmCuN 84A6w5d1uu84xgE2xAr99jGKjWd0U2aheKuVZofbDqWhDvu1n90iFLgLC+ksx5wd0f4o SYi5Kyr+qqqyZZjqHTlgPoyhedTSY5UQ7OHKoZuZ0oVw1H+DcWYhDqrLbGrwnWP6mkZj SiF0BucPna5lVDif1Jokvfdczxj6Fmw+PNetsasTuYtn45rEdGkeTyGb7qb0/MvPHQzS hqaQkW+seo7h6IhWT86s1Xc4oHC57adcyx+xOBr7I4cS0PHgTsNJ7aGd2VVLI3eTf2yP 8c6g== X-Gm-Message-State: ALQs6tBuAyvbzu9+4bx3Ej4CkvbSakHLJv5mKSttSsxdLfyfpA25agw1 F9vlHuU1WtAtvHxSgp884FhK/Q== X-Received: by 10.28.232.84 with SMTP id f81mr4394616wmh.27.1524940610807; Sat, 28 Apr 2018 11:36:50 -0700 (PDT) Received: from debian.speedport.ip (p2003006CCD400529356A485EC7273119.dip0.t-ipconnect.de. [2003:6c:cd40:529:356a:485e:c727:3119]) by smtp.googlemail.com with ESMTPSA id h8sm3433336wmc.16.2018.04.28.11.36.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Apr 2018 11:36:50 -0700 (PDT) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Apr 2018 20:37:06 +0200 Message-Id: <20180428183706.2482-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avformat/hls: don't propagate deprecated "user-agent" AVOption 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This code will print a warning if any user agent is set - even if the API user used the proper non-deprecated "user_agent" option. This change should not even break anything, because even if the user sets the deprecated "user-agent" option, http.c copies it to the "user_agent" option anyway. --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index ffec124818..4ee4be769d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1593,7 +1593,7 @@ static int save_avio_options(AVFormatContext *s) { HLSContext *c = s->priv_data; static const char * const opts[] = { - "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL }; + "headers", "http_proxy", "user_agent", "cookies", "referer", "rw_timeout", NULL }; const char * const * opt = opts; uint8_t *buf; int ret = 0;