From patchwork Fri Jun 28 13:32:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13748 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 1F3DD4485F0 for ; Fri, 28 Jun 2019 16:32:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0702668A607; Fri, 28 Jun 2019 16:32:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 260D768974C for ; Fri, 28 Jun 2019 16:32:30 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id p184so2994367pfp.7 for ; Fri, 28 Jun 2019 06:32:30 -0700 (PDT) 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; bh=BMek/EUhDLjV7D1hJVLarxY0js8KI+pY9BFgLbCtFL0=; b=c5NMiBXtbDcNLyjgDTE4+TmAVn/+ubow9AL0XCSw0ftMY9J/mAuiS/9jeSQ7x8wnTk yYufF7K8m5NSegiCVqqjRWPGUy5bCa6vWof3eQyrrb/lv1mFTsPtE70vvoJK4JlgUvap SmCS/jt2dlhWJUSFLZvTjKMkmktnc+r3YzfOeVOVz97cQIPy5qRkmYoj/aPgt+nLHBJ8 vHS7RJ3/sW0ti6JY+C1eD4IeKN+sUpwAUoM7/+KBSHs4700Si0jkkv9Xaj+hBggKpD7e MGyOQ9NnpOqA6RPZ6rfK5nuQap9b32dEm4XlUWyd6VUcr3vgVV83A82I9D3sFc0aaUu9 CyGg== 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; bh=BMek/EUhDLjV7D1hJVLarxY0js8KI+pY9BFgLbCtFL0=; b=M9+AhcNr3K1FQjKmZAbKVVOSeFOb0CJumxftvYYqQp5my6xLPtqrmc/7u72gbuIJwm LhT3LMkzFgTxzotmX9cLdhNJzB/MuFDNXPfMe/jpK8T+5M1z5C5YmLluN95E9dq5K2XD u9NVgQ3DVeYeoVUw4ZcAqvr+c2dPSa+A12RyW1K6hRI5HLBII7QLiIhA+OpctnUrFN9G T646pJGSiVu8yUeLbncqkkfBEpg24KNWy6VFEZYGj1UffoTU6iJ0mum7I2b81jnxtufw HZJ3fUph71Ndo1jKqC1eaPN3QTkDTfb5K2WpG4AAo5oCLxgNK4n+Sk7tPvMuGMQ3HxLn d3wg== X-Gm-Message-State: APjAAAW3w+47Ug6a0J0bkE2cT9m1UBl7eAQpVFeB/AAGzJfZeRjJ/kQV 3sdrzNdUX9S/yfWS+9orv2HuEUL5 X-Google-Smtp-Source: APXvYqwltBwOdSJikWBZ5ZKt6o7OHr6Yw2WsRmRSTzu7Ecwmla3sejHtJR2h+oJ+1AMIC0Krj5Jaow== X-Received: by 2002:a63:89c2:: with SMTP id v185mr9186155pgd.241.1561728748207; Fri, 28 Jun 2019 06:32:28 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id y22sm5645880pfo.39.2019.06.28.06.32.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jun 2019 06:32:26 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2019 21:32:14 +0800 Message-Id: <1561728734-25902-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1561728734-25902-1-git-send-email-mypopydev@gmail.com> References: <1561728734-25902-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/2] doc/muxers: fix docs format for DASH muxer 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix docs format for DASH muxer Signed-off-by: Jun Zhao --- doc/muxers.texi | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index d93d1cf..044c838 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -256,7 +256,7 @@ DASH-templated name to used for the initialization segment. Default is "init-str DASH-templated name to used for the media segments. Default is "chunk-stream$RepresentationID$-$Number%05d$.$ext$". "$ext$" is replaced with the file name extension specific for the segment format. @item -utc_timing_url @var{utc_url} URL of the page that will return the UTC timestamp in ISO format. Example: "https://time.akamai.com/?iso" -@item method @var{method} +@item -method @var{method} Use the given HTTP method to create output files. Generally set to PUT or POST. @item -http_user_agent @var{user_agent} Override User-Agent field in HTTP header. Applicable only for HTTP output. @@ -298,6 +298,7 @@ Write global SIDX atom. Applicable only for single file, mp4 output, non-streami @item -dash_segment_type @var{dash_segment_type} Possible values: +@table @option @item auto If this flag is set, the dash segment files format will be selected based on the stream codec. This is the default mode. @@ -306,6 +307,7 @@ If this flag is set, the dash segment files will be in in ISOBMFF format. @item webm If this flag is set, the dash segment files will be in in WebM format. +@end table @item -ignore_io_errors @var{ignore_io_errors} Ignore IO errors during open and write. Useful for long-duration runs with network output.