From patchwork Sun Nov 15 18:20:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 23653 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EA98C44AEA4 for ; Sun, 15 Nov 2020 20:46:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE96E689F22; Sun, 15 Nov 2020 20:46:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0452968020A for ; Sun, 15 Nov 2020 20:46:40 +0200 (EET) Received: by mail-qt1-f178.google.com with SMTP id 7so11161486qtp.1 for ; Sun, 15 Nov 2020 10:46:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KRfGDJMlF68U9xCEReVYrEkKBrgljIINJztQcePQLsE=; b=Admx0BHXsC2WvSh26RhBm1A2SU2u2A3KSrguCtAm063UgzMVhHT3p9Yu1HKR1kLGTr XGDzxtn5xhrsBUeMnwF1dI0P3il9uUtmxR8C0TFAeWd6POQxw5RL4pnqklEhTOt/kLYm o63mw6EMoeMqF3QyynNd3+i/wi/ftp+nU7EMNiu80tMvgOdwbC8D3zmkPiYSZ8EjHV1l t4akadSTFuCSSF3thL45P5W4DFLKiYEdy0M8d1mfP4gaYpqiNbQPMnZJZyL8TUz6pOoY KLXAMgTFRrcPq7vQAzRsC8FQUKQRZ5bFkEe22Zx4/jBM0bVfqKkuzOv47hke1lvJRCbD vjpg== 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:mime-version :content-transfer-encoding; bh=KRfGDJMlF68U9xCEReVYrEkKBrgljIINJztQcePQLsE=; b=HVeIHXoRFJjbnOZG5kv0d0h/IJ3KpfFzZGz9KMO94jmjCR/tCw4RaOhPkMvUM8/4YC 85JCeRoofotGGbV6hfy7QYTov+1O/xK0/n7qf0KtLtGyfiiRLjYCPMmpoK29h4xGnGPw oHG+BaeseoxT/41R/9OtOZjLSF5ubfN/o09uQAmuBodxFFgJ5A3QNdxEN+0ELfz/U5Q+ 2MeNy5ZW3o36cV/ozjqJMIvypGZSQZAWkW2Blw3k74+16gRcJI4Jf4mpEHn6V3b6sOt5 JjQsyv0dEOwqkV2sQpq18F/u5e0/BSgl4Tq9cHN9NuSXKn3Pn30EL6SO2oNvZCwetWzJ ubyA== X-Gm-Message-State: AOAM530WPm7vhY35AiILjElVW5Tj/k08Xv/27ugLDYHsgw5+SU+grZhs L1y3lN/yXfKF2J4n2eIlKinqmNQYWBM= X-Google-Smtp-Source: ABdhPJxfpoPgGSNkKL0jagV5qonKK/l1aitZBBJNc0/PtxTFFkfBN7imChY7OtP/FL+ElAAvuxpnyw== X-Received: by 2002:ac8:1401:: with SMTP id k1mr11227970qtj.227.1605464417337; Sun, 15 Nov 2020 10:20:17 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id g19sm9305178qkl.86.2020.11.15.10.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 10:20:16 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Nov 2020 13:20:02 -0500 Message-Id: <20201115182005.24702-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/rtsp: set AV_OPT_FLAG_DEPRECATED on depracated options 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Signed-off-by: Andriy Gelman --- libavformat/rtsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index d9832bbf1f..2ef75f50e3 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = { { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC }, { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC }, #if FF_API_OLD_RTSP_OPTIONS - { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC }, + { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED }, { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, #else { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, @@ -102,7 +102,7 @@ const AVOption ff_rtsp_options[] = { COMMON_OPTS(), { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, #if FF_API_OLD_RTSP_OPTIONS - { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, + { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED }, #endif { NULL }, };