From patchwork Sat Oct 22 18:17:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1117 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1547238vsd; Sat, 22 Oct 2016 11:17:53 -0700 (PDT) X-Received: by 10.28.159.16 with SMTP id i16mr15589134wme.122.1477160273002; Sat, 22 Oct 2016 11:17:53 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v6si8107127wju.295.2016.10.22.11.17.52; Sat, 22 Oct 2016 11:17:52 -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=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5ACD3689944; Sat, 22 Oct 2016 21:17:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD65D689818 for ; Sat, 22 Oct 2016 21:17:40 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id d128so3514403wmf.0 for ; Sat, 22 Oct 2016 11:17:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=yWBP1rCBk3UIlfrue2D++aCbyN+PvjY8isC2VxAdyx4=; b=ahvCdZo+7tX9Azs1hWk8ZrOJEo98VhRsB8q1JKq+4emM7X5D/o30gMWFwkf+XbxJ07 4POzyA+nqAnvp0c6jm7hkjH8ZY6tVTL0q44fwwU4wzlkihowSVikGfmjzWKSBdl8OscS kQ1d61b+QL0f4JFpbKwqUnjxtBCdIyyWvHZaGxaRZhyZVhzioyW65GKvQyqoM8sDbN6P ZbAqCK/AKiJomVrq+5kjR9EPkWvBf6gM57Onb/durehmn3iZaV3l29G8KJAvFW5hTUys h6y+JQzPCYz41AsexN3kecQlJwqH/TA5JmlrHgYzLAt33oKyiSfKSV0WhzqTt8jsVrN0 XKlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=yWBP1rCBk3UIlfrue2D++aCbyN+PvjY8isC2VxAdyx4=; b=ATUJ5uPDxPJMkgsIhpsodAEGkw2KqpFDMgeEwFjWf4F/jUF/VfQLcFncXgAs9lRofG cc4brbYhGT0kwKObdkeftNAJFJ0tjOZ+g1HUrzhQkVLXBpaUP9pntlezDT8DBuLdTtwl XiqYyEsBQzX32mGOwzv9ExR4Ho6uc5Vi76hp89t3vWf8rGorgjBi3UDqVZn05kjWbXz2 nVL0nn7adkytIoB2bC7OwX2VinL1yEYc1TZl2k+3V6L4RhyhkOBv/LmYWOg2G/dfhVEh CKL2N+pam6L22q1ZdWE2rN8kF6VLQlngis5cg3/N2Zkwo6tOoE6IEjydBQzwVwz7aF8H MeTQ== X-Gm-Message-State: AA6/9Rln9CQpRuXnHsun8FxWz3kItwE98UK0nxCtR9B7A1ZHGNrxbgQEg1iA728WqlJUEw== X-Received: by 10.28.69.214 with SMTP id l83mr15715044wmi.119.1477160263301; Sat, 22 Oct 2016 11:17:43 -0700 (PDT) Received: from [192.168.2.21] (p5B095D8F.dip0.t-ipconnect.de. [91.9.93.143]) by smtp.googlemail.com with ESMTPSA id r1sm9494629wjc.43.2016.10.22.11.17.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Oct 2016 11:17:42 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Sat, 22 Oct 2016 20:17:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] faq: use relative links to own documentation 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" This way locally installed documentation refers to itself instead of the website. Bud-Id: https://bugs.debian.org/841501 Signed-off-by: Andreas Cadhalpun --- doc/faq.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/faq.texi b/doc/faq.texi index ef111c7..ff35c89 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -311,18 +311,18 @@ invoking ffmpeg with several @option{-i} options. For audio, to put all channels together in a single stream (example: two mono streams into one stereo stream): this is sometimes called to @emph{merge} them, and can be done using the -@url{https://ffmpeg.org/ffmpeg-filters.html#amerge, @code{amerge}} filter. +@url{ffmpeg-filters.html#amerge, @code{amerge}} filter. @item For audio, to play one on top of the other: this is called to @emph{mix} them, and can be done by first merging them into a single stream and then -using the @url{https://ffmpeg.org/ffmpeg-filters.html#pan, @code{pan}} filter to mix +using the @url{ffmpeg-filters.html#pan, @code{pan}} filter to mix the channels at will. @item For video, to display both together, side by side or one on top of a part of the other; it can be done using the -@url{https://ffmpeg.org/ffmpeg-filters.html#overlay, @code{overlay}} video filter. +@url{ffmpeg-filters.html#overlay, @code{overlay}} video filter. @end itemize @@ -333,19 +333,19 @@ There are several solutions, depending on the exact circumstances. @subsection Concatenating using the concat @emph{filter} -FFmpeg has a @url{https://ffmpeg.org/ffmpeg-filters.html#concat, +FFmpeg has a @url{ffmpeg-filters.html#concat, @code{concat}} filter designed specifically for that, with examples in the documentation. This operation is recommended if you need to re-encode. @subsection Concatenating using the concat @emph{demuxer} -FFmpeg has a @url{https://www.ffmpeg.org/ffmpeg-formats.html#concat, +FFmpeg has a @url{ffmpeg-formats.html#concat, @code{concat}} demuxer which you can use when you want to avoid a re-encode and your format doesn't support file level concatenation. @subsection Concatenating using the concat @emph{protocol} (file level) -FFmpeg has a @url{https://ffmpeg.org/ffmpeg-protocols.html#concat, +FFmpeg has a @url{ffmpeg-protocols.html#concat, @code{concat}} protocol designed specifically for that, with examples in the documentation. @@ -485,7 +485,7 @@ scaling adjusts the SAR to keep the DAR constant. If you want to stretch, or “unstretch”, the image, you need to override the information with the -@url{https://ffmpeg.org/ffmpeg-filters.html#setdar_002c-setsar, @code{setdar or setsar filters}}. +@url{ffmpeg-filters.html#setdar_002c-setsar, @code{setdar or setsar filters}}. Do not forget to examine carefully the original video to check whether the stretching comes from the image or from the aspect ratio information.