[FFmpeg-devel] [PATCH 1/2] faq: disambiguate "join".

[Stefano Sabatini]

On date Monday 2012-07-23 15:04:57 +0200, Nicolas George encoded:
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  doc/faq.texi |   45 ++++++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 42 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/faq.texi b/doc/faq.texi
> index d10faa1..93ba105 100644
> --- a/doc/faq.texi
> +++ b/doc/faq.texi
> @@ -213,8 +213,46 @@ For ANY other help on Avisynth, please visit the
>  
>  @section How can I join video files?
>  
> -A few multimedia containers (MPEG-1, MPEG-2 PS, DV) allow to join video files by
> -merely concatenating them.
> +To "join" video files is quite ambiguous. Using accurate words will make
> +finding resources easier. To join video files may mean:
> +
> + at itemize
> +
> + at item
> +To put them one after the other: this is called to @emph{concatenate} them
> +(in short: concat) and is addressed
> + at ref{How can I concatenate video files, in this very faq}.
> +
> + at item
> +To put them together in the same file, to let the user choose between the
> +different versions (example: different audio languages): this is called to
> + at emph{multiplex} them together (in short: mux), and is done by simply using
> +several @option{-i} options to ffmpeg.
> +
> + at item
> +For audio, to put all channels together in a single stream (example: two
> +mono streams into one stereo stream): this is sometimes called to
> + at emph{merge} them, and can be done using the
> + at url{http://ffmpeg.org/ffmpeg.html#amerge, @code{amerge}} filter.
> +
> + at 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{http://ffmpeg.org/ffmpeg.html#pan, @code{pan}} filter to mix
> +the channels at will.
> +
> + at 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
> + at url{http://ffmpeg.org/ffmpeg.html#overlay, @code{overlay}} video filter.
> +
> + at end itemize
> +
> + at anchor{How can I concatenate video files}
> + at section How can I concatenate video files?
> +
> +A few multimedia containers (MPEG-1, MPEG-2 PS, DV) allow to concatenate
> +video by merely concatenating the files them.
>  
>  Hence you may concatenate your multimedia files by first transcoding them to
>  these privileged formats, then using the humble @code{cat} command (or the
> @@ -259,7 +297,8 @@ from all but the first stream. This can be accomplished by piping through
>  @code{tail} as seen below. Note that when piping through @code{tail} you
>  must use command grouping, @code{@{  ;@}}, to background properly.
>  
> -For example, let's say we want to join two FLV files into an output.flv file:
> +For example, let's say we want to concatenate two FLV files into an
> +output.flv file:

LGTM, thanks.
-- 
FFmpeg = Fundamentalist and Formidable Merciful Ponderous Elastic Game