From patchwork Mon Apr 19 14:09:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp559693iob; Mon, 19 Apr 2021 07:16:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP/pwxeF3WwlvnbtJ96+EpdZtPpr2+wF2DMHuOOouYD/ZUi5k1O85i/XSIf82IkBebf2Eb X-Received: by 2002:aa7:d5da:: with SMTP id d26mr26660929eds.379.1618841778400; Mon, 19 Apr 2021 07:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841778; cv=none; d=google.com; s=arc-20160816; b=gLM6bEs7cWl8EgkAGMBU/vKZSgYWBEo04alaKJPRMfgSeK3tCwNrHUqzS857wOPPxf /RUudG+IUUt9Jr6u/quGLc7ieXsRbXog6xYB/Opo24Nyvn/bgOWqCfvXrvcEFKtlvKfO pZJVLgD8cJRObff9RbeOdbk5Aspgg6xnarHO4d/2tkNMM71UqEVGnE61auBjxuADOGZa tyw0z0vnY93HVgl6ixW2Br1eFdEQs4jtEXTgPauaQM06Ja82+CwX7yEITregNGMIzun4 CrKn1q3vqzB2yvy5V6J3fvOpXLs4hn0hfngdCmZRuMADYuD6iqyLqLFog5UfE58vFl2m GXxQ== 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=ES/kf70e+w0jYDG3Xo3idMjZ6satgFoHZDx+fB/C9HQ=; b=jW2VVqvXEHxZkgd2s75JUzkFQ+njGWtVAVbBGQv4i/WX4G0127r+8O1IWJqxj392jD IkVdPGhyCIEfswbZkC/RWQPGsJaeQV+ym+6h2EnQNFYe+o2i1i3fZnjTnERzdP2/OBTa CgB7D6n+yb3o461paGGNKMhBTh5BWXiUcgUb6INDZsJJrOs1w7yV2t8bcmDw5rD2YyDG SH2X4wmYYfO9ikSbFI5ev9brsF8eJeEKwrne3yCiaCE5boRZE3E6DFpFdlaohw0IadMb G8hwtcNuEn8ZNrZrNuhtfTQCqBg5dqi3hc0ZTNwZidTwwQEm/51rb8BJmyP61oxtEjvO YzIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=J5U3hDM8; 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 k23si5639089edx.591.2021.04.19.07.16.17; Mon, 19 Apr 2021 07:16:18 -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=J5U3hDM8; 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 73B6B689753; Mon, 19 Apr 2021 17:11:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F15106881C2 for ; Mon, 19 Apr 2021 17:11:52 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id i11so11394780qvu.10 for ; Mon, 19 Apr 2021 07:11:52 -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=q0NAFRK4CkzaePvnHqahb3uoJS1MH50b98gVbepoJX8=; b=J5U3hDM8TRCHlrivxPv+AhJ9ESI2cKOHN/GhXlZqXGkGKIacw8iWSTYlP5DeSk+8P0 uLa1F2LOwipH5y7Njna61g5f9ui+/qRNZ7sK89Bq02nSycOaTs/E/rS/poUvY0LIelb0 9hHPS+CAdJVk2fUjneJxEW22oKupmVnhYuhKS7oEC3wlacaG+gOSDdiB6Nh3dXtC8KMz 3zm54Ps7l44d2GIRTEzXpwLzfAYSY29dEzI8IteQTch66RXhv0EWg0NAwtc8u5ekL9dg XkL+iTSPn85H7LxczUoLDG2WuT4RNeu4SlTDg0tWi3bSZRha3tK1XlXb2Wjm4Btuw/C0 o71Q== 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=q0NAFRK4CkzaePvnHqahb3uoJS1MH50b98gVbepoJX8=; b=iQDtIozREEVTpiXiO1gbnxYRyHHiuvhi43UaGw34Q9P130AywwFeNfzp9QWMI174ME 4xGtkNr5WAB8Zya1FTlMGoRKA/JfE3Peb4RyAEWW9gd2K2QPJwWgRBXDULk9ZaDmFJCS Jg++6mQ6tk5oGDofxMOFNj5JJqwAkNm2Bbo/IMIXKEzyWjNZ3V7R8rm6L0q6QlCL3B+7 pBCijNzaaGrbkDhInSNyp9tA+6zF5/7j5jlwnfyXKbYGX4cC4/obcARSngIT86vFTt8z xY3bNCERYekybzwGbjQfHiVGTOf5dGc1jlGJO1MZYaSIOgERfKNOYRGIMSNI5d5HKEK5 auCQ== X-Gm-Message-State: AOAM530bDvddi8u7/yJvn1vsKIN27H8tyig9Evh2uLGS6FgwHp1F5Nq9 B8Nc1smn8/SaFD3MEWHK4cXZ3EAkCH8= X-Received: by 2002:a05:6214:1381:: with SMTP id g1mr22077231qvz.21.1618841511391; Mon, 19 Apr 2021 07:11:51 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:38 -0300 Message-Id: <20210419141024.8174-42-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 41/87] avformat/hlsenc: Remove deprecated localtime 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: jKUG2JwGMEHQ From: Andreas Rheinhardt Deprecated in fbd8746efabe441469eb410d2ffa6af64987ca80. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 6 ------ libavformat/hlsenc.c | 6 ------ libavformat/version.h | 3 --- 3 files changed, 15 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index fb5fde05af..29f1d3aee4 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -833,9 +833,6 @@ This example will produce the playlists segment file sets: @file{vs0/file_000.ts}, @file{vs0/file_001.ts}, @file{vs0/file_002.ts}, etc. and @file{vs1/file_000.ts}, @file{vs1/file_001.ts}, @file{vs1/file_002.ts}, etc. -@item use_localtime -Same as strftime option, will be deprecated. - @item strftime Use strftime() on @var{filename} to expand the segment filename with localtime. The segment number is also available in this mode, but to use it, you need to specify second_level_segment_index @@ -853,9 +850,6 @@ ffmpeg -i in.nut -strftime 1 -hls_flags second_level_segment_index -hls_segment_ This example will produce the playlist, @file{out.m3u8}, and segment files: @file{file-20160215-0001.ts}, @file{file-20160215-0002.ts}, etc. -@item use_localtime_mkdir -Same as strftime_mkdir option, will be deprecated . - @item strftime_mkdir Used together with -strftime_mkdir, it will create all subdirectories which is expanded in @var{filename}. diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3b9f61d2cb..6e7d6d554b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3128,13 +3128,7 @@ static const AVOption options[] = { {"periodic_rekey", "reload keyinfo file periodically for re-keying", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_PERIODIC_REKEY }, 0, UINT_MAX, E, "flags"}, {"independent_segments", "add EXT-X-INDEPENDENT-SEGMENTS, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_INDEPENDENT_SEGMENTS }, 0, UINT_MAX, E, "flags"}, {"iframes_only", "add EXT-X-I-FRAMES-ONLY, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_I_FRAMES_ONLY }, 0, UINT_MAX, E, "flags"}, -#if FF_API_HLS_USE_LOCALTIME - {"use_localtime", "set filename expansion with strftime at segment creation(will be deprecated)", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, -#endif {"strftime", "set filename expansion with strftime at segment creation", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, -#if FF_API_HLS_USE_LOCALTIME - {"use_localtime_mkdir", "create last directory component in strftime-generated filename(will be deprecated)", OFFSET(use_localtime_mkdir), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, -#endif {"strftime_mkdir", "create last directory component in strftime-generated filename", OFFSET(use_localtime_mkdir), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, {"hls_playlist_type", "set the HLS playlist type", OFFSET(pl_type), AV_OPT_TYPE_INT, {.i64 = PLAYLIST_TYPE_NONE }, 0, PLAYLIST_TYPE_NB-1, E, "pl_type" }, {"event", "EVENT playlist", 0, AV_OPT_TYPE_CONST, {.i64 = PLAYLIST_TYPE_EVENT }, INT_MIN, INT_MAX, E, "pl_type" }, diff --git a/libavformat/version.h b/libavformat/version.h index 7f04b92d37..ab103f410c 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_HLS_USE_LOCALTIME -#define FF_API_HLS_USE_LOCALTIME (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_LAVF_KEEPSIDE_FLAG #define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59) #endif