[FFmpeg-cvslog] faq: disambiguate "join".

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Jul 23 14:35:10 2012 +0200| [2d6f442ca1b3f90c9fd9b230ce9c8379d04b9dd3] | committer: Nicolas George

faq: disambiguate "join".

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d6f442ca1b3f90c9fd9b230ce9c8379d04b9dd3
---

 doc/faq.texi |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/doc/faq.texi b/doc/faq.texi
index 950d2e8..5d11064 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -213,8 +213,47 @@ 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. The following list explains the
+different kinds of "joining" and points out how those are addressed in
+FFmpeg. 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
+invoking ffmpeg with several @option{-i} options.
+
+ 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 +298,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:
 
 @example
 mkfifo temp1.a