From patchwork Thu Sep 15 14:04:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 585 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp3209505vsd; Thu, 15 Sep 2016 07:11:41 -0700 (PDT) X-Received: by 10.28.52.210 with SMTP id b201mr3500163wma.32.1473948701749; Thu, 15 Sep 2016 07:11:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u123si1570569wmf.146.2016.09.15.07.11.34; Thu, 15 Sep 2016 07:11:41 -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 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 085FD68A0BF; Thu, 15 Sep 2016 17:11:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f174.google.com (mail-qk0-f174.google.com [209.85.220.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 476EE68A083 for ; Thu, 15 Sep 2016 17:11:13 +0300 (EEST) Received: by mail-qk0-f174.google.com with SMTP id w204so52061450qka.0 for ; Thu, 15 Sep 2016 07:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=KVSrismUmRkZkSaFPygrVub8g9c8DdnVeZEgU30aaxQ=; b=y5lFwSWsot3gNAaHt1fMZ53culTH1GzIFTAdsSSiwlAjFhRf6BAxhD1baRu3oXmOr3 ttmrP2eXukWbQRh7FulGXYpK+ZVFv24jgj7UyO3kwoSNa/vycdVUjoQXTRll2f1oNwXH 5yikN4UbRZhhC7fs+4fuylQArf5nwN8AWmRPFFGacpo+JdDFlARFpRQ115BnLa+2wYNc MAHyWMCLG8jWTY2RkWuuOnm1Ask5MFtBKzpdA1BIjq2RcIc/K7xvUP/NeFRRRKtsBDL2 +lD/HcAD9G2DMxmiW67ZmwClsvG6ELJcU7H9b5TrnM5PpjXmip/YWGeQWRFZCZ78xSzt 2VAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=KVSrismUmRkZkSaFPygrVub8g9c8DdnVeZEgU30aaxQ=; b=T06Z+DvAYSoprlagQAYjabB5GuXqUeiFHw0gnWPXm9ldo1ONEC/yj1SaEGXGDoPclH ZM3ykgDH8aSnHN3HNtkkj0jT8DX1nlGjdE2k3fXtJKQlE8igoKcyhm43CRcngXG8Gwbf Eqe7hRYO/frFTby5wcQgSpz43VB/IX1sBgO7V05K7Qa0erwsZquzphsAofFkAA53Ixqx ADGrR6Vn6wKqQH/XAx24O5oHazcbEiaPDDnbM78JJAtDKYRNbCvcOeZ2kGD45k7mhuB8 de6rfWRB8NqPkZ7tQ/+ljTDzZDqx1XkGtFJJgizlbwhRihP7+/JjBkIs9tIoiauHDc/r 52HA== X-Gm-Message-State: AE9vXwON25l1v/6+RliM5qDIJouB31RH0cJensYL72tXxKdRF6HrwrHG+ywWkmCRnbTj9C0OlRmreKjA4hFlTw== X-Received: by 10.55.10.22 with SMTP id 22mr10169064qkk.215.1473948288877; Thu, 15 Sep 2016 07:04:48 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.56.42 with HTTP; Thu, 15 Sep 2016 07:04:48 -0700 (PDT) From: Steven Liu Date: Thu, 15 Sep 2016 22:04:48 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avformat/http: remove duplicate user-agent option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" double user-agent option, same option, remove one. Signed-off-by: Steven Liu --- libavformat/http.c | 1 - 1 file changed, 1 deletion(-) - { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, D | E }, { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E }, { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, diff --git a/libavformat/http.c b/libavformat/http.c index adb3d92..f2bfb17 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -131,7 +131,6 @@ static const AVOption options[] = { { "headers", "set custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "content_type", "set a specific content type for the POST messages", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D | E }, { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D },