From patchwork Mon Apr 19 14:09:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559346iob; Mon, 19 Apr 2021 07:15:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz83gh0OZZdUK6UjGInt8s7FHfQ25OgPhMN0VOs+JrJtwv3Q2TYqpz6GSSXUuwKrubwf3Zq X-Received: by 2002:aa7:c5c2:: with SMTP id h2mr11969007eds.38.1618841754311; Mon, 19 Apr 2021 07:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841754; cv=none; d=google.com; s=arc-20160816; b=FuB0IKJZyGo1VBxTXGbRP3KOkd4XLin1pUVukkrB4Mk1WmrXdN3D+nUq28n4b2crnp kYwmeEWcCgisjiV1811p/hbgaNjKJlzu0zrsG+3Z2sraGVEVk1GRyF0rJRUL2bJcCz7/ zQyPDlWg/SskNEVp0UWYWPVJ38+nh7RDd4LZw8HoUL1rhczt6+BK5/8MARmJCb0pzRzS d/hqdoM/v0fMdev8esp/mJzFHdADuSye1Jbf5u0yxO6J0I+FgbY5T6vt+3vT8y//6Rjr Y5vaDBdzO3GH3t9QY6BqYWzJH1ZygcBgWF3AMDea4FGcPoWWS0gRlxa1HL1r0Kw1s32p w6KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ebRwRm0oOhJmAxe6xM17HY5tqs1Ig5lHNOSDkWYy05Q=; b=0/P6yxx3TGsMIwz8PKV89wP7v0ursQGLJkTx3nNr3zoxzg/ckmjKdW+bAlUSGBVn8e A4Iqbp8SEy5hYF6VcLBXR9OeHKQin8MfSnDOP8Xw8f27hPcDnuGAN6fCCRLs4Vkt9S9N /lzLu8ER4zCeZFqCK5ZkSahkWO3r0bj0IjaXLgAdMq0BA0WcgO84vapntfJsX2VVevFd hURA6KG2PtVY4LiF2wU3zzO8iIUkdcDxEzArp4tsxeOSIIId8hq5P0Y79KDRo+DTH9Z9 KDnN+/KbCiMX0e3YDBiyXelGqc/Uko/Mev9AlUIQe2/1Gr/UVtFYSNbKJPn8yoMZTiO5 GOFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="ehd/xE0J"; 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 gy25si12304306ejb.576.2021.04.19.07.15.54; Mon, 19 Apr 2021 07:15:54 -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=20161025 header.b="ehd/xE0J"; 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 76D9E688374; Mon, 19 Apr 2021 17:11:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F321C6880FE for ; Mon, 19 Apr 2021 17:11:49 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id i12so4319379qke.3 for ; Mon, 19 Apr 2021 07:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=omJQw6puLRcvIMBTDI3Ux1a74js99iaOX2kzH/tZLck=; b=ehd/xE0JgQqd99nxvAJTs2wo+a38PNRq6ShpYMo/HC4DityrwJ4xf+uCWvHQHgeLTX Gkmjf/76RwNSY7Lfp2Sl315insJb8v81L47i8+D8jkd5TUYn4yoUOUOfs3aUrVddi7Id HvXorAyIFSv2CFcjvvMzC3PH2+F7gRuWs/lHvPvfrKxuvRGXAb/MYuJaNEw1DZWBAY7d 1WVyU9oDJoWNHB7OJykOv0LpqsFVkjrnKBf+Tjyh33pqMVcXIa67OKceXbYekrW/9LW3 5Wdr6nC5v24YBjnwtHU69uVzigKRK5Q5t5QbYTE1RX82itXb4wirUKEsmq9cOZrTIpaA c6IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=omJQw6puLRcvIMBTDI3Ux1a74js99iaOX2kzH/tZLck=; b=oDm1lGf/3mg4JEaI22XFC+eXCkL36OzIbbUixAAW7pJYiDJEKUsQRF/skUQFpHOtI0 TnE3ojdLisyXypwbljVDTRKUmsMGBi4bWRmm6CMTeREFNwKwj/cYrif3XO1PuJsEc4oI 7iIBo0shpC+Wv+NC0DD2WHRcsvM6EsFX5vNsEfef8sxJ8bimVIQR7qWCAg3173gjUSw8 gRwqIv61LdVgO6EgwzjDJ+me8uXrId3RKnTCGLCovuQtCMvKzKcKS3Z4IyBLjz4vwF/z RN/TG9SByW2A/rrGJPE/VTGx0Zz8Tcyzx/ca8y7D3iPNOYUl9L56m//XJGy5JbYYslce MsCg== X-Gm-Message-State: AOAM533n9er7bqfeUjCMJ1rk+dzHtZqwioyd5hNfzIoQ9N6aF7vl/vUK 0J+eXNJo4NWPp6sGJOrW8zVpZeISoaM= X-Received: by 2002:a37:a6d2:: with SMTP id p201mr8254185qke.146.1618841508637; Mon, 19 Apr 2021 07:11:48 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:36 -0300 Message-Id: <20210419141024.8174-40-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 39/87] avformat/http: Remove deprecated "user-agent" option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qG6ZgoVfzJcQ From: Andreas Rheinhardt Deprecated in 27714b462d1bff9e9b40fbdabb39f58e79032b81. Signed-off-by: Andreas Rheinhardt --- doc/protocols.texi | 3 --- libavformat/http.c | 3 --- libavformat/version.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index a6e46b99ad..2cc2b561de 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -406,9 +406,6 @@ Set the Referer header. Include 'Referer: URL' header in HTTP request. Override the User-Agent header. If not specified the protocol will use a string describing the libavformat build. ("Lavf/") -@item user-agent -This is a deprecated option, you can use user_agent instead it. - @item reconnect_at_eof If set then eof is treated like an error and causes reconnection, this is useful for live / endless streams. diff --git a/libavformat/http.c b/libavformat/http.c index fb2d9306bd..1fc95c768c 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -141,9 +141,6 @@ static const AVOption options[] = { { "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 }, { "referer", "override referer header", OFFSET(referer), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, -#if FF_API_HTTP_USER_AGENT - { "user-agent", "use the \"user_agent\" option instead", OFFSET(user_agent), 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 }, { "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/version.h b/libavformat/version.h index e0cf9e6f3e..39aa408fd6 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_HTTP_USER_AGENT -#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_HLS_WRAP #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59) #endif