[FFmpeg-cvslog] faq: suggest the concat filter.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Jul 23 15:02:57 2012 +0200| [0f8f9248471bbee5649c8efdc52d02c1cf93bba1] | committer: Nicolas George

faq: suggest the concat filter.

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

 doc/faq.texi |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/faq.texi b/doc/faq.texi
index 5d11064..430207d 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -252,6 +252,15 @@ the other; it can be done using the
 @anchor{How can I concatenate video files}
 @section How can I concatenate video files?
 
+There are several solutions, depending on the exact circumstances.
+
+ at subsection Concatenating using filters
+
+FFmpeg has a @url{http://ffmpeg.org/ffmpeg.html#concat-1, @code{concat}}
+filter designed specifically for that, with examples in the documentation.
+
+ at subsection Concatenating at the file level
+
 A few multimedia containers (MPEG-1, MPEG-2 PS, DV) allow to concatenate
 video by merely concatenating the files them.
 
@@ -291,6 +300,8 @@ cat intermediate1.mpg intermediate2.mpg |\
 ffmpeg -f mpeg -i - -qscale:v 2 -c:v mpeg4 -acodec libmp3lame -q:a 4 output.avi
 @end example
 
+ at subsection Concatenating using raw audio and video
+
 Similarly, the yuv4mpegpipe format, and the raw video, raw audio codecs also
 allow concatenation, and the transcoding step is almost lossless.
 When using multiple yuv4mpegpipe(s), the first line needs to be discarded