From patchwork Sun Mar 7 00:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26241 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 01A2A449AD5 for ; Sun, 7 Mar 2021 02:16:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6E9F68A83C; Sun, 7 Mar 2021 02:16:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BAEA68A636 for ; Sun, 7 Mar 2021 02:16:30 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id jt13so12380105ejb.0 for ; Sat, 06 Mar 2021 16:16:30 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=ZUx8gWbtBzXs+YIIqWbMHje5L+WbewZ3nmNrQh107FI=; b=DdJGfMPHkOMbSJM/V3CZj/2UI1jc/nG7D2A4+oIAyrwMCZ0DyPvo0QjwUO6JdANOQJ dKZBfja16HNCkVJmTfyEEV/uyKDh/ARvH8CYwLWVWe805/Dn96mV+z+dLL21s4z6KAKP epH8vROEFhTMZdcefPZUudlJy2q8KH0QjiPSRMjtsFGuzsMxT1Xo6/oSDDwlrCMI5y/8 0XbYbRMAzT18/F+xZlfR5UESFmbyiAM8VKp52Rpuwo35J6LGpREk47JDUNnvYk/RlM46 d1OQXrZuA0xGeTUvbAnAkqcWZi4Ea/erD4omV196ipTGTjT1oJWLISGNUpP/gAXbvOoS 3ffg== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=ZUx8gWbtBzXs+YIIqWbMHje5L+WbewZ3nmNrQh107FI=; b=gUesOP7j3f0ydFM43XsnsYO+SE7ZA7ho5qHaAVKulDOHrTdTKNlNsnFKbahysSqmaW 9aFYZDvOKS9ZqKojkijmHmm4N3NGlm9o+jK4ybHUuArouYwdfxosm9cWTso/3QzDIuiv hfqWsha1+SOCPr5jD/T4BH0aIxm2nmcr/9AhjQoGdClU7k33AdKJo9YVSKOrHgMOMRr8 zYZMiHqjQfq4U2qrBI/wuNBXiuh4KF/j05Em2GwUFeu5q1gt/lUndDPIW5ErU5B87Baq K4o4oUr274iN9JCZOTx+Jp+ft2o7y+pi1SQKP8ssmaN+8/2lwTEXS5xuYq4PfXkHgMEa pTdw== X-Gm-Message-State: AOAM531IqW0J1Emt4s8RxKHk9zL35N6CSKY34QEFb9wuAMZ4EUPlTVFs 5KHT9Lx/l9wS3m49KrzpVQz8+mLyFYg= X-Google-Smtp-Source: ABdhPJwhy2QPUNSUWDPjJ8catLbOpfSNbyckygS+WQbi8VHEnzQDCQbdxWTTDf5TlnktovDjI4zNPA== X-Received: by 2002:a17:906:9442:: with SMTP id z2mr9125034ejx.79.1615076189362; Sat, 06 Mar 2021 16:16:29 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b12sm4325421eds.94.2021.03.06.16.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 16:16:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Mar 2021 01:16:01 +0100 Message-Id: <20210307001601.2126517-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210307001601.2126517-1-andreas.rheinhardt@gmail.com> References: <20210307001601.2126517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] doc/muxers.texi: Readd documentation removed accidentally 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Happened in e7c04eaf50b4b50f2528ab2c69b76777a1862535. Signed-off-by: Andreas Rheinhardt --- doc/muxers.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 1f9f2937f8..74833d7611 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -242,6 +242,8 @@ This is a deprecated option to set the segment length in microseconds, use @var{ @item seg_duration @var{duration} Set the segment length in seconds (fractional value can be set). The value is treated as average segment duration when @var{use_template} is enabled and +@var{use_timeline} is disabled and as minimum segment duration for all the other +use cases. @item frag_duration @var{duration} Set the length in seconds of fragments within segments (fractional value can be set). @item frag_type @var{type}