From 7c81b013ace98e2920e1e52f276bb8c79cdeb0bb Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 21 Mar 2005 01:12:45 +0000
Subject: [PATCH] MEncoder now supports multiple files. patch by Oded Shimon
 <ods15 at ods15 dot dyndns dot org>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14976 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/man/en/mplayer.1 | 11 +++++++++++
 DOCS/xml/en/faq.xml   | 22 ++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 77aa35b2ac..30edf78cc3 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -156,14 +156,25 @@ mencoder \- movie encoder
 .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 --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index 2d2280573d..1504eb9b13 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -1314,20 +1314,18 @@ and even burn them directly to CD.
 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>