[MPlayer-DOCS] [PATCH] MEncoder Multi File

[Oded Shimon]

Small patch, only fixes the man page synopsis and the FAQ entry.
More should probably be added, to the MEncoder XML guide...

 - ods15
-------------- next part --------------
Index: DOCS/man/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.912
diff -u -r1.912 mplayer.1
--- DOCS/man/en/mplayer.1	6 Mar 2005 21:22:08 -0000	1.912
+++ DOCS/man/en/mplayer.1	20 Mar 2005 20:11:35 -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
 .
Index: DOCS/xml/en/faq.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/faq.xml,v
retrieving revision 1.64
diff -u -r1.64 faq.xml
--- DOCS/xml/en/faq.xml	26 Feb 2005 01:11:13 -0000	1.64
+++ DOCS/xml/en/faq.xml	20 Mar 2005 20:11:36 -0000
@@ -1314,20 +1314,17 @@
 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,
-<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
+MPEGs can be concatenated into a single file with luck.
+For AVIs, you can use <application>MEncoder</application>'s multiple file support like this:
 <screen>
-     cat file1 file2 > file3
-     mencoder -ovc copy -oac copy -o out.avi -forceidx file3.avi
+     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.transcoding.org/">transcode</ulink>
+tool set).
 </para></answer>
 </qandaentry>