From patchwork Tue Jun 4 10:58:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Alfred E. Heggestad" X-Patchwork-Id: 13409 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 B4CEB449432 for ; Tue, 4 Jun 2019 14:03:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 913C0681850; Tue, 4 Jun 2019 14:03:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6134C681850 for ; Tue, 4 Jun 2019 14:03:40 +0300 (EEST) Received: by mail-lj1-f196.google.com with SMTP id m23so952689lje.12 for ; Tue, 04 Jun 2019 04:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=An44ihZPLNRSCBDNBcWZeNLaFHHhLjYqOXNI5rR2kys=; b=cDL1wg65NlXuHZ7M+d0quyGEWlWYc9LGykHtJoWbVBYcAd6UdbBaVFXgDsgM7bQQDo F4z8dK4dWE3YAziXpbIvBTW93YbYy7sgK9PQyb2OFsjn+b8WYxFERBnI0DHXk05Q4Yub fDKK0+OvOZcx2ZZec6pnZeeDbhuwNluMJBefqSJyf+vp0sx4/pVIrfjkxXFhVVLoF+aR LvvibVIYBzDnKyqBoHYBQk/tRKhsxPM4Nd8ZNslbYcw8br8pYVw3ylqJiUtY+h0DMlUj ziYdqt/0jWGBitQSxejKZxTTiCSXCV16cJqAQx9aGEKTWiTJ5t6jfNdakI6f/uCltdvo 4HCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=An44ihZPLNRSCBDNBcWZeNLaFHHhLjYqOXNI5rR2kys=; b=i4HncESefNs9QFpG2EPzxjLjHh82SINAHKH/Q5A25ehDtJbnh3wiHFxvzsWWobvWih 6BwB0esLdeevLLz80ddx/0F2sgUbEK8yhToNt2kkO9duNLH2BSF9dz3x7kWaQxcca2NQ kP9y7q/8EgK/D0JR6qQj9gN2ovReRW+bmp/LRjgbR4VokXK5I+yFxfgnCaSkwHs3qSpZ ZzqLchZsCWiUstjRswR0bOuTT2Ko2cqJdQJTZ73iPtU2EdkrNEkX3GXQVlbRhrtui+5f UMmeuWr8lGeYJHvw4D9J2vEl4M3xnxUevKIMI+D9yJ/tVJUGkFDux1D/gh2Sl1EQt5Va CMAg== X-Gm-Message-State: APjAAAVMI7SCnZTGNYliS37ni8QXhAoVmqH1Y2nkivypyV1DdrRml31q XrtYzPyGpwlhJ8ReAJVZgxA= X-Google-Smtp-Source: APXvYqyWRifZu1Vx1NQIwhbJZa6gWrgC2P6ogh8H9ru9lSDou3a+nzdJ8TAMnZ/LLAottZ3AMFYTYw== X-Received: by 2002:a2e:3a1a:: with SMTP id h26mr16500086lja.156.1559645902182; Tue, 04 Jun 2019 03:58:22 -0700 (PDT) Received: from Alfreds-MacBook-Pro.local ([88.87.32.234]) by smtp.gmail.com with ESMTPSA id t3sm1357010lfk.59.2019.06.04.03.58.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 03:58:21 -0700 (PDT) To: FFmpeg development discussions and patches , "Jeyapal, Karthick" References: <0b4d6029-1333-4078-85bb-4124db9ef6a6@gmail.com> <51303F7D-B4A6-4401-80A9-0BEAC928BBDF@akamai.com> From: "Alfred E. Heggestad" Message-ID: Date: Tue, 4 Jun 2019 12:58:17 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <51303F7D-B4A6-4401-80A9-0BEAC928BBDF@akamai.com> Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH] fix typo in dashenc 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi Karthick, thanks for your feedback. here is an updated patch as you suggested. From 7879e39c25ede24693f166eb6a63094757d9fb1e Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 4 Jun 2019 09:39:59 +0200 Subject: [PATCH] dashenc: fix typo in seg_duration description doc: fix typo (seconds -> microseconds) --- doc/muxers.texi | 2 +- libavformat/dashenc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) + { "seg_duration", "segment duration (in microseconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E }, { "remove_at_exit", "remove all segments when finished", OFFSET(remove_at_exit), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { "use_template", "Use SegmentTemplate instead of SegmentList", OFFSET(use_template), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E }, { "use_timeline", "Use SegmentTimeline in SegmentTemplate", OFFSET(use_timeline), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E }, diff --git a/doc/muxers.texi b/doc/muxers.texi index c73719c421..be02912b29 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -232,7 +232,7 @@ ffmpeg -re -i -map 0 -map 0 -c:a libfdk_aac -c:v libx264 @item -min_seg_duration @var{microseconds} This is a deprecated option to set the segment length in microseconds, use @var{seg_duration} instead. @item -seg_duration @var{duration} -Set the segment length in seconds (fractional value can be set). The value is +Set the segment length in microseconds (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. diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 94b198ceb8..a70e9d176c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1863,7 +1863,7 @@ static const AVOption options[] = { #if FF_API_DASH_MIN_SEG_DURATION { "min_seg_duration", "minimum segment duration (in microseconds) (will be deprecated)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E }, #endif - { "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E },