From patchwork Mon Jan 16 13:38:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1038154pzb; Mon, 16 Jan 2023 05:41:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvv1p19VOi+dFRr1TDzsZxLWE7apLNJ7b+K9BhVNGmeeI6spVi+15v7ZyXEF1EM90neqDZI X-Received: by 2002:a05:6402:2b89:b0:46c:aa8b:da5c with SMTP id fj9-20020a0564022b8900b0046caa8bda5cmr75622028edb.33.1673876479612; Mon, 16 Jan 2023 05:41:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876479; cv=none; d=google.com; s=arc-20160816; b=MTpsuS4vF04iiQnw6fPIVPBAWG0AWpbesRkUAqO5pPWFJcrXwsxcbKXPeKHUQ9IuNv qI6qO6RMqqjknJ5wMqns7dLnm21r2EK5QbcQ0IinAT2sBDHgnt7Q/jtTsxRJkcivmEiB g2Z0KBKs2jQDUKW1umoz0lbLKhL52gWQOucNgt0qA0gDbSzOk37eZ7qPn4ztWaNvfDWg KTY1v/xbxR5ppySgzcynmHGS0bmfSmXW2URtI4GqRgii1WBL0i0WiJ2fd7oIPTxxC/5s pjyloT/yQJBraOm+9ZU166bemFHP4F4UMzvsHAzCrRFtx4/8HatoBc8gATBaPbZv6V13 Ck6w== 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=LEY6YV1zaLwywiC88b9H1NRZXhOMnRDR8FSK4wfOm8M=; b=SGpOZHZ6OwvpiZGTM6cqjBxyS0DlnRc978ve+cmuuYWK6aIyoQuTRKU25dmz4COabN t3vkNa/+MC34CEN4bkmoAdAb6Mn80dCYpUp7XNc/iuF7PYoEDZIRMzAxo79a3321gVL4 cnmIo9vkN3EjtocBoqNaAWouwSfgNjFYDhtZWn7LSJvm95yuC42PLQGwOwQ+omS54cCM WgxFZ02lhSsK7xmRhWvp5+PPU/a2daRAqEQEQpnHWqXJuX1Vrw70Mk+pozZdZCWuRx8e U49ffU1CvjtAxRoi3GelyA47bEzGshhZEhmaIyQKtTQYkbczjdEE9PuHRlIBnnCqgbH2 2vAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YkziIdsp; 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 s8-20020aa7cb08000000b0049e267de108si913655edt.209.2023.01.16.05.41.19; Mon, 16 Jan 2023 05:41:19 -0800 (PST) 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=20210112 header.b=YkziIdsp; 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 0F0AC68BE06; Mon, 16 Jan 2023 15:39:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB62968BDDA for ; Mon, 16 Jan 2023 15:39:24 +0200 (EET) Received: by mail-ot1-f47.google.com with SMTP id p17-20020a9d6951000000b00678306ceb94so16122693oto.5 for ; Mon, 16 Jan 2023 05:39:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HkV3Rz49vXTlSyhGG/Z0tT0LEFMFOUAawsagdQH9AUE=; b=YkziIdspYV6TWyYD/+pc6kg8azeJMj6XEsjSN63NCyz5pA/AtfYzhcXNlHCigj3Zs/ 2POdB99YlUKaVfY6xZesw24lMkItn+vIPc7boBKN6aoBJ5DTtWOhPneYr+/rm5TqdqJJ YtP0cliHjyW8Dz+TiaD5wULZANFHB6dbGilb39gaE45RkVfZfqYkWB9Xa3NgOCExB1q7 /lyL87vmuSuCaDj04HGqzChqyISJF5+ELxIz6BmcqWeqdQA++P+7czsbyha6yrAEu4wi b+eJkUYwtpDPwC8OFpCnuGpv5P7r8FCS+mJo5rkIR2E1Hx/4w6Td0ERFo6TybXWvRN2S qvRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HkV3Rz49vXTlSyhGG/Z0tT0LEFMFOUAawsagdQH9AUE=; b=nTPKwqART5xCq6322ITq9tajvaGUzZhYwJlbMgxcnfc14R7pd54eqtiV9Fx32d0XSG ff5EA1hbEt4eicFQQzhEFTRkFEPObTo7pAUhT2RVuA0x6fOfKYrxX1ULf69kD5W5YuaI zUHkF0IAFmqKyJLV2VUfDkqwtPOwftjHKzmgbZ/h7RbVB2lPqAk9Uzz5EKhfmV7Pwit1 huXeSdpa2DYU7jTmcFd526NMo7tzugj+Ik6kJres/LiDMLcU9UDIowEEOn/8/oPiSOrG DfG5iVFRinAMDyQqtnO2uGJ9aRWBA7qtMUN+peZH3bbb0vAutX/llW7pMhC2liHP03pl cwyw== X-Gm-Message-State: AFqh2kpaesJG92h8yQbce0RZoz/5E/1Qan04fUL64hrzAsytEYE1w6pn qONfYIP7L6cubhxtqC8nkCBwZgxxNjo= X-Received: by 2002:a9d:7416:0:b0:66c:37a2:d87d with SMTP id n22-20020a9d7416000000b0066c37a2d87dmr9119786otk.26.1673876362849; Mon, 16 Jan 2023 05:39:22 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:22 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:27 -0300 Message-Id: <20230116133840.512-14-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/26] avformat: remove FF_HLS_TS_OPTIONS 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: M+chnATYB1PW Signed-off-by: James Almer --- libavformat/hlsenc.c | 3 --- libavformat/version_major.h | 1 - 2 files changed, 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 39df9becc7..32491b4534 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3116,9 +3116,6 @@ static const AVOption options[] = { {"hls_init_time", "set segment length at init list", OFFSET(init_time), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, E}, {"hls_list_size", "set maximum number of playlist entries", OFFSET(max_nb_segments), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E}, {"hls_delete_threshold", "set number of unreferenced segments to keep before deleting", OFFSET(hls_delete_threshold), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, E}, -#if FF_HLS_TS_OPTIONS - {"hls_ts_options","set hls mpegts list of options for the container format used for hls (deprecated, use hls_segment_options instead of it.)", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E | AV_OPT_FLAG_DEPRECATED}, -#endif {"hls_vtt_options","set hls vtt list of options for the container format used for hls", OFFSET(vtt_format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, {"hls_allow_cache", "explicitly set whether the client MAY (1) or MUST NOT (0) cache media segments", OFFSET(allowcache), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, E}, {"hls_base_url", "url to prepend to each playlist entry", OFFSET(baseurl), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 044af1ebf6..057d1ac0fb 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -42,7 +42,6 @@ * */ #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) -#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59) #define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60)