From d11ac64ecf03f7896ebc5e776e078fdc1f0543a4 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 6 Feb 2013 22:40:18 +0100 Subject: [PATCH] =?UTF-8?q?doc:=20replace=20'=C3=97'=20symbol=20with=20'x'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-ascii chars are not correctly rendered in both MAN and HTML output or may even cause compilation failure. Thus avoid to use them until we find a satisfying way to deal with them. Fix trac ticket #2243. --- doc/ffmpeg.texi | 2 +- doc/filters.texi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 4761d39a83..8dc97b892f 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1024,7 +1024,7 @@ ffmpeg -filter_complex 'color=c=red' -t 5 out.mkv As a special exception, you can use a bitmap subtitle stream as input: it will be converted into a video with the same size as the largest video in -the file, or 720×576 if no video is present. Note that this is an +the file, or 720x576 if no video is present. Note that this is an experimental and temporary solution. It will be removed once libavfilter has proper support for subtitles. diff --git a/doc/filters.texi b/doc/filters.texi index 76a73e6dad..e0478522df 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5996,7 +5996,7 @@ Activate unsafe mode: do not fail if segments have a different format. The filter has @var{v}+@var{a} outputs: first @var{v} video outputs, then @var{a} audio outputs. -There are @var{n}×(@var{v}+@var{a}) inputs: first the inputs for the first +There are @var{n}x(@var{v}+@var{a}) inputs: first the inputs for the first segment, in the same order as the outputs, then the inputs for the second segment, etc.