summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-20 06:40:48 +0000
committergabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-20 06:40:48 +0000
commitf29ddd4a2e90c082e8c7de6c014a76c264954651 (patch)
tree594ce89d7ab23fb2383666ebdadb878217475a21 /DOCS
parentc4694513818135bc2eaa77cb203bd998019af3bc (diff)
downloadmpv-f29ddd4a2e90c082e8c7de6c014a76c264954651.tar.bz2
mpv-f29ddd4a2e90c082e8c7de6c014a76c264954651.tar.xz
updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5721 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/Hungarian/encoding.html5
-rw-r--r--DOCS/encoding.html4
-rw-r--r--DOCS/mencoder.15
-rw-r--r--DOCS/mplayer.12
4 files changed, 13 insertions, 3 deletions
diff --git a/DOCS/Hungarian/encoding.html b/DOCS/Hungarian/encoding.html
index 831a05a89f..14c4700bbf 100644
--- a/DOCS/Hungarian/encoding.html
+++ b/DOCS/Hungarian/encoding.html
@@ -83,7 +83,10 @@ másoló, és video átméretező képességgel.</P>
kikapcsolható)</LI>
<LI>FPS javítás az <CODE>-ofps</CODE> opcióval (hasznos ha 29.97fps-es
VOB-ot kódolsz 24fps-es AVI-ba)</LI>
- <LI>kép átméretezése</LI>
+ <LI>a video filter réteg használata (crop, expand, flip, postprocess,
+ rotate, scale, RGB/YUV konverzió)</LI>
+ <LI>a kimeneti file-ba bele tudja kódolni mind a DVD/VOBsub, mind a
+ szöveges feliratokat</LI>
</UL>
</P>
diff --git a/DOCS/encoding.html b/DOCS/encoding.html
index 5bff8e7eed..dde420208d 100644
--- a/DOCS/encoding.html
+++ b/DOCS/encoding.html
@@ -78,7 +78,9 @@ stream copying and video resizing abilities.</P>
<LI>input A/V synchronizing (PTS-based, can be disabled with -mc 0 option)</LI>
<LI>FPS correction with <CODE>-ofps</CODE> option (useful when encoding
29.97fps VOB to 24fps AVI)</LI>
- <LI>movie rescaling</LI>
+ <LI>using our very powerful plugin system (crop, expand, flip, postprocess,
+ rotate, scale, rgb/yuv conversion)</LI>
+ <LI>can encode DVD/VOBsub <B>AND</B> text subtitles into the output file</LI>
</UL>
</P>
diff --git a/DOCS/mencoder.1 b/DOCS/mencoder.1
index 3ddc9cecb7..7af578e458 100644
--- a/DOCS/mencoder.1
+++ b/DOCS/mencoder.1
@@ -43,6 +43,7 @@ mencoder \- Movie Encoder for Linux
.RB [ \-ss\ <time> ]
.RB [ \-endpos\ <time> ]
.RB [ \-audiofile\ <file\ name> ]
+.RB [ \-sub\ <subtitle\ file\ name> ]
.I - or file or files specified with escaped wildcard or device
.PP
.SH DESCRIPTION
@@ -277,6 +278,10 @@ seek to given time position. For example :
Can start only from keyframes !
.TP
+.B \-sub <subtitle file name>
+given VOBsub/text subtitle will be encoded INTO the output file. Text
+subtitles need fonts properly installed.
+.TP
.B \-endpos <time>
stop encoding at given time. Can be specified in many was :
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index aa58849d0a..568b564a35 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -636,7 +636,7 @@ See '\-vc help' for FULL list!
Select video channel [MPG: 0\-15 ASF: 0\-255 ]
.TP
.B \-vop <filter>
-Activate video filters (see documentation at DOCS/tech/vop.txt !).
+Activate video filters (see documentation!).
.TP
.B \-vsync
Enables VBI for vesa