From patchwork Sat Feb 4 10:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1870671pzk; Sat, 4 Feb 2023 02:48:19 -0800 (PST) X-Google-Smtp-Source: AK7set/gJdkkHeUxmkWn3Jn8u/9uZR577+iqcpLaKtI8l5l99sXMsMpYXQgcm1b5j0RwlJN2m//y X-Received: by 2002:a17:907:362:b0:883:3299:91c8 with SMTP id rs2-20020a170907036200b00883329991c8mr13207310ejb.55.1675507699039; Sat, 04 Feb 2023 02:48:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507699; cv=none; d=google.com; s=arc-20160816; b=w39rp5X68SEkyCoDhd6JYsIo2VVoULayqH28kVmVJRhbX1H+RIzIzRaefYC16xU3cL AECm2BXzxIBunluMIVGj1rAL2DVYWyQEmAnhnRr2nPuDCbaiyFI0eYS+70L3TVFlF2us 0hfGCEeUKk7jpf1SQxLSP8NSjphqMubWiYZOllgUstFct5W+vsjG9TIddWGjkkN0HrWR Rph9i7uD+4ELfg9bi328D8yGH90gmE8WTMGe9j1vRP+fjQRWBbQ1f693DIxHq9l+XCua OwWS40m6wzwq3jNafTuZMDHurvYGOKFmO9+LIc92yM7k8uH1o3qnc1PFW84il8Izz32X e0mg== 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:delivered-to; bh=CRLo4dMwbznjd6wD2to7u3uvW66+rQhTM54YitFC1/c=; b=bMRIB4BvHTgjYoEWZuCScMhB4hP8H0THFU1vhe8ibet4k9Bwc3R2Re5CqTGrtLFSHf Sh5uLT5EBZGmq6Q1o9Pdip6cxoymlmNZzrZSmUaDAXGNdeYSLQErWM4FeNo13rv9jCoQ 8CvBK+owKs90x3TS8A9n1iICw45ghVEFzbZEjMt0QwHwilYYLvLHU05lxIU7LaJ0cCtX Txw8CLHTDAButWq9Ne32EBxDGIi76B7AAunfmzTOBhLEdeVW5Tf4uo36vEF0NfLN1jEx zGLXHJbniM67aX0NmcTBIzybmrHZ80YNg98egz/QXEC6K2eSzznv5SJ6YBqdszgVygQg /hdQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s8-20020aa7c548000000b004a2569f6b95si5377520edr.365.2023.02.04.02.48.18; Sat, 04 Feb 2023 02:48: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; 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 F3DA068B526; Sat, 4 Feb 2023 12:44:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9BF568BEE8 for ; Sat, 4 Feb 2023 12:44:20 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B9AC72404EC for ; Sat, 4 Feb 2023 11:44:20 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 79CDidnh8Jn0 for ; Sat, 4 Feb 2023 11:44:18 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 406C8240D23 for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id EC9163A056E for ; Sat, 4 Feb 2023 11:44:05 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:50 +0100 Message-Id: <20230204104204.20721-20-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 19/33] 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: klS5UKvrR7n2 From: James Almer 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 adf06ec7643..dcc363b42e3 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 044af1ebf6f..057d1ac0fb0 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)