X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fswfcombine.1;h=ec2b1716ec0032ffffc72c9bf73d5ca0b4b6a8a4;hb=a05dff1a071e82d3817eddb45972900b3076997a;hp=d1e484e209fcca1e0804e9921c4f969d19c3002c;hpb=fc554a43712b76d16b41ec77dd311b4a78b1ef6b;p=swftools.git

diff --git a/src/swfcombine.1 b/src/swfcombine.1
index d1e484e..ec2b171 100644
--- a/src/swfcombine.1
+++ b/src/swfcombine.1
@@ -18,9 +18,9 @@ movie. swfcombine can be used to perform the latter.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Print short help message and exit
-.\".TP
-.\" \fB\-\-version\fR
-.\" Print version info and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version info and exit
 .TP
 \fB\-o\fR, \fB\-\-output\fR \fIfilename\fR
 Explicitly specify output file. (otherwise, output.swf will be used)
@@ -31,6 +31,9 @@ Don't remove any master objects, only overlay new objects.
 \fB\-c\fR, \fB\-\-clip\fR
 Clip the slave objects by the corresponding master objects.
 .TP
+\fB\-d\fR, \fB\-\-dummy\fR
+Don't require the presence of slave objects. Usually used together with \fB\-X\fR, \fB\-Y\fR or \fB\-r\fR.
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 Be verbose. Use more than one -v for greater effect.
 .TP
@@ -38,6 +41,15 @@ Be verbose. Use more than one -v for greater effect.
 Don't assume the first file is a master file. Instead, store each
 file in a seperate frame.
 .TP
+\fB\-X\fR, \fB\-\-width\fR \fIwidth\fR
+Force the output to width \fIwidth\fR. (Otherwise, the width of the master file will be used)
+.TP
+\fB\-Y\fR, \fB\-\-height\fR \fIheight\fR
+Force the output to height \fIheight\fR. (Otherwise, the height of the master file will be used)
+.TP
+\fB\-r\fR, \fB\-\-rate\fR \fIrate\fR
+Force the output to have the framerate \fIrate\fR. (Otherwise, the framerate of the master file will be used)
+.TP
 \fB\-x\fR, \fB\-\-xpos\fR \fIxpos\fR
 (move x) Adjust position of slave by xpos twips (1/20 pixel).
 .TP
@@ -72,7 +84,7 @@ the decimal number of the file, starting by zero (00).
 Create two flash movies. Insert some rectangle into one of them, and give
 it a name. (E.g. "foo") Now call
 
-swfcombine -o combined.swf master.swf foo:slave.swf
+swfcombine -o combined.swf master.swf foo=slave.swf
 
 As a result, the slave movie should be visible inside the master movie
 at the position where the rectangle used to be.