# HG changeset patch
# User diego
# Date 1111367565 0
# Node ID 9c2052060e4560e255d6c77983537e899baf2e17
# Parent  e6b885fef1712686e979313d127e002c4e7bd10c
MEncoder now supports multiple files.
patch by Oded Shimon <ods15 at ods15 dot dyndns dot org>

diff -r e6b885fef171 -r 9c2052060e45 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Sun Mar 20 22:35:53 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Mar 21 01:12:45 2005 +0000
@@ -156,14 +156,25 @@
 .br
 .in
 .B gmplayer
+'in +\n[.k]u
 [options]
 [\-skin\ skin]
 .
 .br
+.in
 .B mencoder
+'in +\n[.k]u
 [options]
 .RI [ \ file\  | \ URL\  | \ \-\  ]
 [\-o\ file]
+.
+.br
+.in
+.B mencoder
+'in +\n[.k]u
+[global options]
+.I file1
+[specific options] [file2] [specific options]
 .ad
 .hy
 .
diff -r e6b885fef171 -r 9c2052060e45 DOCS/xml/en/faq.xml
--- a/DOCS/xml/en/faq.xml	Sun Mar 20 22:35:53 2005 +0000
+++ b/DOCS/xml/en/faq.xml	Mon Mar 21 01:12:45 2005 +0000
@@ -1314,20 +1314,18 @@
 How can I join two video files?
 </para></question>
 <answer><para>
-This has been discussed to no end on mplayer-users. Go search the
-<ulink url="http://mplayerhq.hu/cgi-bin/s-arch.cgi?sbm=mplayer-users">archives</ulink>
-for a complete answer. This is a complicated topic and your mileage may vary a
-lot depending on the kind of files you want to merge. MPEGs can be concatenated
-into a single file with luck. For AVIs there are two tools,
+MPEG files can be concatenated into a single file with luck.
+For AVI files, you can use <application>MEncoder</application>'s
+multiple file support like this:
+<screen>
+mencoder -ovc copy -oac copy -o out.avi file1.avi file2.avi
+</screen>
+This will only work if the files are of the same resolution and codec.
+You can also try
 <ulink url="http://fixounet.free.fr/avidemux/">avidemux</ulink> and
 <application>avimerge</application> (part of the
-<ulink url="http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/">transcode</ulink>
-tool set), available that might do the job. You can also try <application>MEncoder</application>
-if you have two files sharing the same dimensions and codec. Try
-<screen>
-     cat file1 file2 > file3
-     mencoder -ovc copy -oac copy -o out.avi -forceidx file3.avi
-</screen>
+<ulink url="http://www.transcoding.org/">transcode</ulink>
+tool set).
 </para></answer>
 </qandaentry>