From patchwork Sun Apr 22 14:38:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 8556 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2813901jad; Sun, 22 Apr 2018 07:38:34 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/2Qaf45gmRwdwyXFbHwBeHS7wdQL+LSI/LRsitanRWgtNK/3LVrLOyYJNP7HuEZuSfOnjw X-Received: by 2002:adf:9045:: with SMTP id h63-v6mr14999972wrh.218.1524407914382; Sun, 22 Apr 2018 07:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524407914; cv=none; d=google.com; s=arc-20160816; b=TKws4ZXp+H/uu2P3JOK4SzOC1esPvl6kuf0jLyJ88t3Avn95WqvBDuEW7IyzceD45Y Fqf3Tw6gucfXtCdKxZQDfrxolOalqqfSuB+jCR8jnMaNMAM+C2Jb1UCdepyYWVDityoS ivpXznXzEqblJjFDzljzqkKrnu1t7wdc11iE1dx5P7JhChyu7cTuvY0zQNbts7S/Xrun dGOBIl00S+al1NJakA7FOZ3E9BgKWUXFx5ZGMlMDncekGftYqMjLQEtb4SoL26butnPb MEYYt/1Bb4IxRu6g7LhNeeAEgqths2OdXYSnXzeH+2PlYhGe5lBGIWErrcUvUBqrv8Ss U6ww== 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:references:in-reply-to:message-id:date :to:from:domainkey-signature:dkim-signature:delivered-to :arc-authentication-results; bh=tnumxJDiS21G7Pv8F9lbpEDi9tiO3SIC/GS41n7Zqs4=; b=dDKKfvYyHMX17LlwLV9ACGhX7S5csPy4YX6NsdP/5fhKKcaeELfDovluocJXTVIiSs bWjykAkzAUlaUgSQbL2mFwekZV/jPRGzu3rplJHWT7YQxlznPMcU5XMcoVf7WJp11Nfk bnR6maSrqb3zkPRIuiU6tT+Uf4wJ7WMNTYMjaKItDFN34RAtHxEEacLFNPEVZVUbRz+L pdP6ItjdX9UNKW47DsEdqzG/4e+qUPskWDLPvbrP9gSKAagcMuhHHQim82pN1FLgT8Pk floIqMLsOGmZAKn2e0Wn1FVqACkeyQYUdfHOT0Rx2JhN43aje8u6hy1jM9ypNg1/RO8W TJiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=b61mgM/X; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j15-v6si2743849wrd.69.2018.04.22.07.38.34; Sun, 22 Apr 2018 07:38:34 -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=@pkh.me header.s=selector1 header.b=b61mgM/X; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CC3568A288; Sun, 22 Apr 2018 17:37:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72D4868A26F for ; Sun, 22 Apr 2018 17:37:51 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id eab10427 for ; Sun, 22 Apr 2018 14:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references; s=selector1; bh=yo4F84z/BeyX/a0ZNu+/fE9rTvU=; b=b61mgM/XvIdJLb9YCg9bN5EPU1Yj mECURdaeAoi2fygLGA8yA9SqciXi1M2BoOv9t++ZfmpvLBFzZQKMjpXGPx+WCGZZ A6HLOLrDQ88ATcshIBZpeBhXpCcRJf11jzR51sGocipQjofANR4KtS2T/t/TfdsX dr2eX2kzoNVuMAZBUnE63+Er9Rbp+qU8X5UmsbK8Kcv3uBiiWgt4kHT81P1NIasw nhvv/zeSxyccr+MHuLOGAsFROrZshyWQfeC7VX2qDpQee74Pq3iijTGIvUOJnzVL QU8R1xRFxTquwu0ae1iVYDJbQtdCVYveSgVGT3ljFDITiyWRCsOOGX40Dg== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references; q=dns; s=selector1; b=B dSb3+owMVPTBBmaITOTF+HtQ7aYArU1o+dvDCY2coiGospYiZEdAQ3J9OI9RvEvf yLtcQQkBJHUPV/kngOkgWWdnB5AnXztFjBsluAyIP6gputxgNPA3ET5uJJc6MRT/ cjw14H4VC73FEBTRicFiGgEw3X//zSaotHt9xVRNzWvjCd4WLx1Npy8Q/e1gh4LJ CR0Z0/14fT5SGnCIEBzrtdjz/Z/kOAR50GtekO18ypkUtoVfGY9PvIvz0qQ250th YCXggQu01x3rHNZy2N3Tul35lMrsZHZ+bdN9qHJcBGXqTK3FDma6fGHe/tp/ntWu U2DEnxxDAW+602p0BE5jQ== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id f20e0780; Sun, 22 Apr 2018 14:38:14 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:38:09 +0200 Message-Id: <20180422143809.29617-2-u@pkh.me> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422143809.29617-1-u@pkh.me> References: <20180422143809.29617-1-u@pkh.me> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/http: use AV_OPT_FLAG_DEPRECATED for 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 Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- There are probably a bunch of other options and I don't plan to look for them, I just needed at least one example of use. --- libavformat/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index aa6348f28b..3a35bc7eac 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -141,7 +141,7 @@ static const AVOption options[] = { { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, { "referer", "override referer header", OFFSET(referer), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, #if FF_API_HTTP_USER_AGENT - { "user-agent", "override User-Agent header", OFFSET(user_agent_deprecated), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D }, + { "user-agent", "use the \"user_agent\" option instead", OFFSET(user_agent_deprecated), AV_OPT_TYPE_STRING, { .str = DEFAULT_USER_AGENT }, 0, 0, D|AV_OPT_FLAG_DEPRECATED }, #endif { "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 }, @@ -1193,7 +1193,6 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, #if FF_API_HTTP_USER_AGENT if (strcmp(s->user_agent_deprecated, DEFAULT_USER_AGENT)) { - av_log(s, AV_LOG_WARNING, "the user-agent option is deprecated, please use user_agent option\n"); s->user_agent = av_strdup(s->user_agent_deprecated); } #endif